diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 2a0a187..2a4f5b9 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -14,7 +14,7 @@ jobs:
image: onedev.site.tesses.net/crosslang/crosslang:latest
interpreter: !DefaultInterpreter
commands: |
- bash ./pack.sh
+ crossint ./build.tcross pack
useTTY: true
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
- !PublishArtifactStep
diff --git a/README.md b/README.md
index 23630ca..c395c65 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,15 @@
# To Build
```bash
-./script.sh
+crossint ./build.tcross
```
# To Install
```bash
-./install.sh
+crossint ./build.tcross install
+```
+
+# To Pack
+```bash
+crossint ./build.tcross pack
```
\ No newline at end of file
diff --git a/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross b/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross
index d6512a2..4b4e50b 100644
--- a/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross
+++ b/Tesses.CrossLang.BuildEssentials/src/PackageManager.tcross
@@ -50,14 +50,16 @@ func Tesses.CrossLang.PackageManager()
ParseFileName,
GetPackageServers = ()=>{
var packageConfigFile = configRoot / "package_servers.json";
+
if(FS.Local.RegularFileExists(packageConfigFile))
{
- return Json.Decode(FileReadString(FS.Local, packageConfigFile));
+ return Json.Decode(FS.ReadAllText(FS.Local, packageConfigFile));
}
return ["https://cpkg.tesseslanguage.com/"];
},
GetPackage = (this,name, version) =>
{
+
var v = Version.Parse(version);
var useCache = v.Stage != "dev";
var pkgFile = packageCache / name / v.ToString();
@@ -71,6 +73,7 @@ func Tesses.CrossLang.PackageManager()
{
//https://cpkg.tesseslanguage.com/api/v1/download?name=MyPackage&version=1.0.0.0-prod
var uri = $"{item.TrimEnd('/')}/api/v1/download?name={Net.Http.UrlEncode(name)}&version={Net.Http.UrlEncode(version)}";
+ Console.WriteLine($"Downloading: {name} {version} from {item}");
var req = Net.Http.MakeRequest(uri);
if(req.StatusCode == 200)
{
diff --git a/Tesses.CrossLang.BuildEssentials/src/buildtool.tcross b/Tesses.CrossLang.BuildEssentials/src/buildtool.tcross
index 998967e..c123e01 100644
--- a/Tesses.CrossLang.BuildEssentials/src/buildtool.tcross
+++ b/Tesses.CrossLang.BuildEssentials/src/buildtool.tcross
@@ -11,15 +11,6 @@ func Tesses.CrossLang.BuildTool(pm)
return {
DirectoriesCompiled = [],
- FileReadString = (fs,path) =>{
- var f = fs.OpenFile(path,"rb");
- var ms = FS.MemoryStream(true);
- f.CopyTo(ms);
- var text = ms.GetBytes().ToString();
- f.Close();
- ms.Close();
- return text;
- },
GetPackageDependencies = (this,name,version,dir)=>{
var dep = pm.GetPackage(name,version);
if(TypeOf(dep) == "Null") throw $"Package {name} with version {version} does not exist";
@@ -68,7 +59,7 @@ func Tesses.CrossLang.BuildTool(pm)
var crossConf = dir / "cross.json";
if(FS.Local.FileExists(crossConf))
{
- var configData = Json.Decode(this.FileReadString(FS.Local,crossConf));
+ var configData = Json.Decode(FS.ReadAllText(FS.Local,crossConf));
var info = {type = "console"};
var name = "out";
var version = "1.0.0.0-prod";
@@ -221,7 +212,7 @@ func Tesses.CrossLang.BuildTool(pm)
{
var src = {
FileName = file.ToString(),
- Source = this.FileReadString(FS.Local, file)
+ Source = FS.ReadAllText(FS.Local, file)
};
sources.Add(src);
}
diff --git a/Tesses.CrossLang.PackageServer/components/counter.tcrml b/Tesses.CrossLang.PackageServer/components/counter.tcrml
deleted file mode 100644
index 1b4fca4..0000000
--- a/Tesses.CrossLang.PackageServer/components/counter.tcrml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Count is
-
\ No newline at end of file
diff --git a/Tesses.CrossLang.PackageServer/components/shell.tcrml b/Tesses.CrossLang.PackageServer/components/shell.tcrml
deleted file mode 100644
index 06d0afc..0000000
--- a/Tesses.CrossLang.PackageServer/components/shell.tcrml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
- Tesses.CrossLang.PackageServer - <?expr Net.Http.HtmlEncode(title) ?>
-
- Tesses.CrossLang.PackageServer
-
-
-
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laboriosam possimus nisi ab nobis magni, error minus vero neque iusto beatae, quasi nostrum. Ut repudiandae expedita reprehenderit tenetur. Sunt, adipisci cumque!
-
-
-
diff --git a/Tesses.CrossLang.PackageServer/pages/counter.tcrml b/Tesses.CrossLang.PackageServer/pages/counter.tcrml
deleted file mode 100644
index 3db6f57..0000000
--- a/Tesses.CrossLang.PackageServer/pages/counter.tcrml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Tesses.CrossLang.PackageServer/pages/index.tcrml b/Tesses.CrossLang.PackageServer/pages/index.tcrml
deleted file mode 100644
index 64a70c2..0000000
--- a/Tesses.CrossLang.PackageServer/pages/index.tcrml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- 1 John 4:4: You, dear children, are from God and have overcome them, because the one who is in you is greater than the one who is in the world.
-
-
-
diff --git a/Tesses.CrossLang.PackageServer/res/simple.min.css b/Tesses.CrossLang.PackageServer/res/simple.min.css
deleted file mode 100644
index 0e54419..0000000
--- a/Tesses.CrossLang.PackageServer/res/simple.min.css
+++ /dev/null
@@ -1 +0,0 @@
-:root{--sans-font:-apple-system,BlinkMacSystemFont,"Avenir Next",Avenir,"Nimbus Sans L",Roboto,"Noto Sans","Segoe UI",Arial,Helvetica,"Helvetica Neue",sans-serif;--mono-font:Consolas,Menlo,Monaco,"Andale Mono","Ubuntu Mono",monospace;--standard-border-radius:5px;--bg:#fff;--accent-bg:#f5f7ff;--text:#212121;--text-light:#585858;--border:#898ea4;--accent:#0d47a1;--accent-hover:#1266e2;--accent-text:var(--bg);--code:#d81b60;--preformatted:#444;--marked:#fd3;--disabled:#efefef}@media (prefers-color-scheme:dark){:root{color-scheme:dark;--bg:#212121;--accent-bg:#2b2b2b;--text:#dcdcdc;--text-light:#ababab;--accent:#ffb300;--accent-hover:#ffe099;--accent-text:var(--bg);--code:#f06292;--preformatted:#ccc;--disabled:#111}img,video{opacity:.8}}*,:before,:after{box-sizing:border-box}textarea,select,input,progress{-webkit-appearance:none;-moz-appearance:none;appearance:none}html{font-family:var(--sans-font);scroll-behavior:smooth}body{color:var(--text);background-color:var(--bg);grid-template-columns:1fr min(45rem,90%) 1fr;margin:0;font-size:1.15rem;line-height:1.5;display:grid}body>*{grid-column:2}body>header{background-color:var(--accent-bg);border-bottom:1px solid var(--border);text-align:center;grid-column:1/-1;padding:0 .5rem 2rem}body>header>:only-child{margin-block-start:2rem}body>header h1{max-width:1200px;margin:1rem auto}body>header p{max-width:40rem;margin:1rem auto}main{padding-top:1.5rem}body>footer{color:var(--text-light);text-align:center;border-top:1px solid var(--border);margin-top:4rem;padding:2rem 1rem 1.5rem;font-size:.9rem}h1{font-size:3rem}h2{margin-top:3rem;font-size:2.6rem}h3{margin-top:3rem;font-size:2rem}h4{font-size:1.44rem}h5{font-size:1.15rem}h6{font-size:.96rem}p{margin:1.5rem 0}p,h1,h2,h3,h4,h5,h6{overflow-wrap:break-word}h1,h2,h3{line-height:1.1}@media only screen and (width<=720px){h1{font-size:2.5rem}h2{font-size:2.1rem}h3{font-size:1.75rem}h4{font-size:1.25rem}}a,a:visited{color:var(--accent)}a:hover{text-decoration:none}button,.button,a.button,input[type=submit],input[type=reset],input[type=button]{border:1px solid var(--accent);background-color:var(--accent);color:var(--accent-text);padding:.5rem .9rem;line-height:normal;text-decoration:none}.button[aria-disabled=true],input:disabled,textarea:disabled,select:disabled,button[disabled]{cursor:not-allowed;background-color:var(--disabled);border-color:var(--disabled);color:var(--text-light)}input[type=range]{padding:0}abbr[title]{cursor:help;text-decoration-line:underline;text-decoration-style:dotted}button:enabled:hover,.button:not([aria-disabled=true]):hover,input[type=submit]:enabled:hover,input[type=reset]:enabled:hover,input[type=button]:enabled:hover{background-color:var(--accent-hover);border-color:var(--accent-hover);cursor:pointer}.button:focus-visible,button:focus-visible:where(:enabled),input:enabled:focus-visible:where([type=submit],[type=reset],[type=button]){outline:2px solid var(--accent);outline-offset:1px}header>nav{padding:1rem 0 0;font-size:1rem;line-height:2}header>nav ul,header>nav ol{flex-flow:wrap;place-content:space-around center;align-items:center;margin:0;padding:0;list-style-type:none;display:flex}header>nav ul li,header>nav ol li{display:inline-block}header>nav a,header>nav a:visited{border:1px solid var(--border);border-radius:var(--standard-border-radius);color:var(--text);margin:0 .5rem 1rem;padding:.1rem 1rem;text-decoration:none;display:inline-block}header>nav a:hover,header>nav a.current,header>nav a[aria-current=page],header>nav a[aria-current=true]{border-color:var(--accent);color:var(--accent);cursor:pointer}@media only screen and (width<=720px){header>nav a{border:none;padding:0;line-height:1;text-decoration:underline}}aside,details,pre,progress{background-color:var(--accent-bg);border:1px solid var(--border);border-radius:var(--standard-border-radius);margin-bottom:1rem}aside{float:right;width:30%;margin-inline-start:15px;padding:0 15px;font-size:1rem}[dir=rtl] aside{float:left}@media only screen and (width<=720px){aside{float:none;width:100%;margin-inline-start:0}}article,fieldset,dialog{border:1px solid var(--border);border-radius:var(--standard-border-radius);margin-bottom:1rem;padding:1rem}article h2:first-child,section h2:first-child,article h3:first-child,section h3:first-child{margin-top:1rem}section{border-top:1px solid var(--border);border-bottom:1px solid var(--border);margin:3rem 0;padding:2rem 1rem}section+section,section:first-child{border-top:0;padding-top:0}section+section{margin-top:0}section:last-child{border-bottom:0;padding-bottom:0}details{padding:.7rem 1rem}summary{cursor:pointer;word-break:break-all;margin:-.7rem -1rem;padding:.7rem 1rem;font-weight:700}details[open]>summary+*{margin-top:0}details[open]>summary{margin-bottom:.5rem}details[open]>:last-child{margin-bottom:0}table{border-collapse:collapse;margin:1.5rem 0}figure>table{width:max-content;margin:0}td,th{border:1px solid var(--border);text-align:start;padding:.5rem}th{background-color:var(--accent-bg);font-weight:700}tr:nth-child(2n){background-color:var(--accent-bg)}table caption{margin-bottom:.5rem;font-weight:700}textarea,select,input,button,.button{font-size:inherit;border-radius:var(--standard-border-radius);box-shadow:none;max-width:100%;margin-bottom:.5rem;padding:.5rem;font-family:inherit;display:inline-block}textarea,select,input{color:var(--text);background-color:var(--bg);border:1px solid var(--border)}label{display:block}textarea:not([cols]){width:100%}select:not([multiple]){background-image:linear-gradient(45deg,transparent 49%,var(--text)51%),linear-gradient(135deg,var(--text)51%,transparent 49%);background-position:calc(100% - 15px),calc(100% - 10px);background-repeat:no-repeat;background-size:5px 5px,5px 5px;padding-inline-end:25px}[dir=rtl] select:not([multiple]){background-position:10px,15px}input[type=checkbox],input[type=radio]{vertical-align:middle;width:min-content;position:relative}input[type=checkbox]+label,input[type=radio]+label{display:inline-block}input[type=radio]{border-radius:100%}input[type=checkbox]:checked,input[type=radio]:checked{background-color:var(--accent)}input[type=checkbox]:checked:after{content:" ";border-right:solid var(--bg).08em;border-bottom:solid var(--bg).08em;background-color:#0000;border-radius:0;width:.18em;height:.32em;font-size:1.8em;position:absolute;top:.05em;left:.17em;transform:rotate(45deg)}input[type=radio]:checked:after{content:" ";background-color:var(--bg);border-radius:100%;width:.25em;height:.25em;font-size:32px;position:absolute;top:.125em;left:.125em}@media only screen and (width<=720px){textarea,select,input{width:100%}}input[type=color]{height:2.5rem;padding:.2rem}input[type=file]{border:0}hr{background:var(--border);border:none;height:1px;margin:1rem auto}mark{border-radius:var(--standard-border-radius);background-color:var(--marked);color:#000;padding:2px 5px}mark a{color:#0d47a1}img,video{border-radius:var(--standard-border-radius);max-width:100%;height:auto}figure{margin:0;display:block;overflow-x:auto}figure>img,figure>picture>img{margin-inline:auto;display:block}figcaption{text-align:center;color:var(--text-light);margin-block:1rem;font-size:.9rem}blockquote{border-inline-start:.35rem solid var(--accent);color:var(--text-light);margin-block:2rem;margin-inline:2rem 0;padding:.4rem .8rem;font-style:italic}cite{color:var(--text-light);font-size:.9rem;font-style:normal}dt{color:var(--text-light)}code,pre,pre span,kbd,samp{font-family:var(--mono-font);color:var(--code)}kbd{color:var(--preformatted);border:1px solid var(--preformatted);border-bottom:3px solid var(--preformatted);border-radius:var(--standard-border-radius);padding:.1rem .4rem}pre{max-width:100%;color:var(--preformatted);padding:1rem 1.4rem;overflow:auto}pre code{color:var(--preformatted);background:0 0;margin:0;padding:0}progress{width:100%}progress:indeterminate{background-color:var(--accent-bg)}progress::-webkit-progress-bar{border-radius:var(--standard-border-radius);background-color:var(--accent-bg)}progress::-webkit-progress-value{border-radius:var(--standard-border-radius);background-color:var(--accent)}progress::-moz-progress-bar{border-radius:var(--standard-border-radius);background-color:var(--accent);transition-property:width;transition-duration:.3s}progress:indeterminate::-moz-progress-bar{background-color:var(--accent-bg)}dialog{background-color:var(--bg);max-width:40rem;margin:auto}dialog::backdrop{background-color:var(--bg);opacity:.8}@media only screen and (width<=720px){dialog{max-width:100%;margin:auto 1em}}sup,sub{vertical-align:baseline;position:relative}sup{top:-.4em}sub{top:.3em}.notice{background:var(--accent-bg);border:2px solid var(--border);border-radius:var(--standard-border-radius);margin:2rem 0;padding:1.5rem}@media print{@page{margin:1cm}body{display:block}body>header{background-color:unset}body>header nav,body>footer{display:none}article{border:none;padding:0}a[href^=http]:after{content:" <" attr(href)">"}abbr[title]:after{content:" (" attr(title)")"}a{text-decoration:none}p{widows:3;orphans:3}hr{border-top:1px solid var(--border)}mark{border:1px solid var(--border)}pre,table,figure,img,svg{break-inside:avoid}pre code{white-space:pre-wrap}}
\ No newline at end of file
diff --git a/Tesses.CrossLang.PackageServer/src/program.tcross b/Tesses.CrossLang.PackageServer/src/program.tcross
index 0669b7d..c7d8b49 100644
--- a/Tesses.CrossLang.PackageServer/src/program.tcross
+++ b/Tesses.CrossLang.PackageServer/src/program.tcross
@@ -1,5 +1,312 @@
var count = 0;
func main(args)
{
- Net.Http.ListenSimpleWithLoop(Router,4206);
+ Console.WriteLine("In main");
+ var dir = ".";
+ if(args.Length > 1)
+ {
+
+ dir = args[1];
+ }
+ DB.Init(dir);
+
+
+ //should be a route but its crosslang so we can use mountable
+
+
+ mountable.Mount("/package_icon.png", (ctx)=>{
+ ctx.ResponseHeaders.SetValue("Content-Type", "image/png");
+ ctx.SendBytes(embed("crosslang.png"));
+ return true;
+ });
+
+ /*
+ PUT /api/v1/upload Authorization Bearer
+ POST /api/v1/login Json object with username and password returns json object with either 200 for success {"token": "TOKEN_VAL"} or non 2XX if fails {"reason": "SOME ERROR"}
+ POST /api/v1/logout use Authorization Bearer
+ GET /api/v1/latest?name=PackageName returns 200 OK with json {"version": "1.0.0.0-prod"} if it succeeds if it fails returns a failing status code with {"reason": "SOME ERROR"}
+ GET /api/v1/download?name=PackageName&version=1.0.0.0-prod returns 200 OK with package bytes or 404 if doesn't exist
+ GET /api/v1/search?q=SomeQuery&offset=&limit= returns 200 OK with json of packages {"packages": [{"name": "pkgName","version": "latestVersion", ...}]} or non success status code
+
+ */
+
+
+ Net.Http.ListenSimpleWithLoop((ctx)=>{
+ if(ctx.Path == "/package")
+ {
+ var name = ctx.QueryParams.TryGetFirst("name");
+ if(TypeOf(name) != "String") name = "";
+ ctx.WithMimeType("text/html").SendText(Pages.Package(name));
+ return true;
+ }
+ if(ctx.Path == "/packages")
+ {
+ ctx.WithMimeType("text/html").SendText(Pages.Packages(ctx));
+ return true;
+ }
+ if(ctx.Path == "/api/v1/latest")
+ {
+ var name = ctx.QueryParams.TryGetFirst("name");
+ if(TypeOf(name) != "String") name = "";
+ var version = DB.GetLatestVersion(name);
+ if(version != null)
+ {
+ ctx.WithMimeType("application/json").SendText(Json.Encode({version}));
+ return true;
+ }
+ }
+ if(ctx.Path == "/api/v1/search")
+ {
+ var q = ctx.QueryParams.TryGetFirst("q");
+ if(TypeOf(q) != "String") q = "";
+ var offset = ParseLong(ctx.QueryParams.TryGetFirst("offset"));
+ if(TypeOf(offset) != "Long") offset=0;
+ var limit = ParseLong(ctx.QueryParams.TryGetFirst("limit"));
+ if(TypeOf(limit) != "Long") limit = 20;
+ if(limit <= 0) limit = 20;
+
+ var res = DB.QueryPackages(q, offset*limit, limit);
+ if(TypeOf(res) != "List")
+ {
+ ctx.StatusCode=500;
+ ctx.SendText("Packages not a list");
+ return true;
+ }
+ else
+ {
+ ctx.WithMimeType("application/json").SendText(Json.Encode({packages=res}));
+ return true;
+ }
+ }
+ if(ctx.Path == "/upload")
+ {
+ if(ctx.Method == "GET")
+ {
+ ctx.WithMimeType("text/html").SendText(Pages.Upload(ctx));
+ return true;
+ }
+ else if(ctx.Method == "POST")
+ {
+ if(ctx.NeedToParseFormData)
+ {
+ var filePath = DB.working / "Temp" / $"{DB.GetUniqueNumber()}.crvm";
+ var hasFile=false;
+ var strm = FS.Local.OpenFile(filePath,"wb");
+ ctx.ParseFormData((mime,filename,name)=>{
+
+ if(name == "package")
+ {
+ if(hasFile) return FS.MemoryStream(true);
+ hasFile=true;
+
+ return strm;
+ }
+ else
+ return FS.MemoryStream(true);
+ });
+
+ strm.Close();
+
+ var session = DB.GetSession(ctx);
+ if(session == null)
+ {
+ ctx.StatusCode = 401;
+ ctx.SendText("You are not logged in ");
+ return true;
+ }
+
+ var csrf = ctx.QueryParams.TryGetFirst("csrf");
+ var result = { Success=false, Reason = "Invalid CSRF"};
+
+ if(DB.VerifyCSRF(session,csrf))
+ {
+ var userId = DB.GetUserIdFromSession(session);
+ result = DB.UploadPackage(userId, filePath);
+ }
+
+ if(FS.Local.FileExists(filePath))
+ FS.Local.DeleteFile(filePath);
+
+ if(result.Success)
+ {
+ ctx.StatusCode = 302;
+ ctx.ResponseHeaders.SetValue("Location", "/");
+ ctx.WriteHeaders();
+ }
+ else
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText(result.Reason);
+ }
+
+ return true;
+ }
+ }
+
+ }
+ if(ctx.Path == "/api/v1/package_icon.png")
+ {
+ var name = ctx.QueryParams.TryGetFirst("name");
+ var version = ctx.QueryParams.TryGetFirst("version");
+ ctx.ResponseHeaders.SetValue("Content-Type", "image/png");
+ ctx.SendBytes(DB.GetPackageIcon(name,version));
+ return true;
+ }
+ if(ctx.Path == "/api/v1/download")
+ {
+ var name = ctx.QueryParams.TryGetFirst("name");
+ var version = ctx.QueryParams.TryGetFirst("version");
+ if(TypeOf(name) != "String") name = "";
+ if(TypeOf(version) != "String") version = "";
+
+ var file = DB.working / "Packages" / name / $"{name}-{version}.crvm";
+
+
+ if(FS.Local.FileExists(file) && name.Length > 0 && version.Length > 0)
+ {
+ var strm = FS.Local.OpenFile(file,"rb");
+ if(strm != null)
+ {
+ ctx.WithMimeType("application/crvm").WithContentDisposition($"{name}-{version}.crvm",false).SendStream(strm);
+ strm.Close();
+ return true;
+ }
+
+ }
+ return false;
+ }
+ if(ctx.Path == "/login")
+ {
+ if(ctx.Method == "GET")
+ {
+ ctx.WithMimeType("text/html").SendText(Pages.Login());
+ return true;
+ }
+ else if(ctx.Method == "POST")
+ {
+
+ var email = ctx.QueryParams.TryGetFirst("email");
+ if(TypeOf(email) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the email buddy ");
+ return true;
+ }
+ var password = ctx.QueryParams.TryGetFirst("password");
+ if(TypeOf(password) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the password buddy ");
+ return true;
+ }
+
+ var accountId = DB.GetAccountId(email, password);
+ if(accountId == -1)
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("Invalid credentials ");
+ return true;
+ }
+
+ ctx.StatusCode = 302;
+ ctx.ResponseHeaders.SetValue("Location", "/");
+ ctx.ResponseHeaders.SetValue("Set-Cookie", $"Session={DB.CreateSession(accountId)}; SameSite=Strict");
+ ctx.WriteHeaders();
+ return true;
+ }
+ }
+ if(ctx.Path == "/signup")
+ {
+ if(ctx.Method == "GET")
+ {
+ ctx.WithMimeType("text/html").SendText(Pages.Signup());
+ return true;
+ }
+ else if(ctx.Method == "POST")
+ {
+ var email = ctx.QueryParams.TryGetFirst("email");
+ if(TypeOf(email) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the email buddy ");
+ return true;
+ }
+ var displayName = ctx.QueryParams.TryGetFirst("displayName");
+ if(TypeOf(displayName) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the displayName buddy ");
+ return true;
+ }
+ var password = ctx.QueryParams.TryGetFirst("password");
+ if(TypeOf(password) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the password buddy ");
+ return true;
+ }
+ var passwordconfirm = ctx.QueryParams.TryGetFirst("passwordconfirm");
+ if(TypeOf(passwordconfirm) != "String")
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("You forgot the passwordconfirm buddy ");
+ return true;
+ }
+
+ if(password != passwordconfirm)
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText("The passwords do not match ");
+ return true;
+ }
+
+ var res = DB.CreateUser(email, displayName, password);
+ if(!res.Success)
+ {
+ ctx.StatusCode = 400;
+ ctx.SendText(%"Error: {Net.Http.HtmlEncode(res.Reason)} ");
+ return true;
+ }
+
+
+ ctx.StatusCode = 302;
+ ctx.ResponseHeaders.SetValue("Location", res.Redirect);
+ ctx.WriteHeaders();
+ return true;
+ }
+ }
+ if(ctx.Path == "/css/bootstrap.min.css")
+ {
+ ctx.WithMimeType("text/css").SendBytes(embed("css/bootstrap.min.css"));
+ return true;
+ }
+ if(ctx.Path == "/css/bootstrap.min.css.map")
+ {
+ ctx.WithMimeType("application/json").SendBytes(embed("css/bootstrap.min.css.map"));
+ return true;
+ }
+
+ if(ctx.Path == "/js/bootstrap.min.js")
+ {
+ ctx.WithMimeType("text/javascript").SendBytes(embed("js/bootstrap.min.js"));
+ return true;
+ }
+
+ if(ctx.Path == "/js/bootstrap.min.js.map")
+ {
+ ctx.WithMimeType("application/json").SendBytes(embed("js/bootstrap.min.js.map"));
+ return true;
+ }
+ if(ctx.Path == "/favicon.ico")
+ {
+ ctx.WithMimeType("image/x-icon").SendBytes(embed("favicon.ico"));
+ return true;
+ }
+ if(ctx.Path == "/")
+ {
+ ctx.WithMimeType("text/html").SendText(Pages.Index());
+ return true;
+ }
+ return false;
+ },4206);
}
\ No newline at end of file
diff --git a/Tesses.CrossLang.Shell/src/main.tcross b/Tesses.CrossLang.Shell/src/main.tcross
index cf33f4e..2a20434 100644
--- a/Tesses.CrossLang.Shell/src/main.tcross
+++ b/Tesses.CrossLang.Shell/src/main.tcross
@@ -494,6 +494,42 @@ func main(args)
else if(commandName == "add-dependency")
{
//crosslang add-dependency Tesses.CrossLang.Markup --version=1.0.0.0-prod
+
+ if(dd.Arguments.Length > 1)
+ {
+
+ var name = dd.Arguments[1];
+ var version = null;
+ each(var opt : dd.Options)
+ {
+ if(opt.Key == "version")
+ version = opt.Value;
+ }
+ if(!FS.Local.FileExists("cross.json"))
+ {
+ Console.WriteLine("The current directory does not have a project");
+ return 1;
+ }
+
+ if(version == null)
+ {
+ var pm = Tesses.CrossLang.PackageManager();
+ version = pm.GetLatest(name);
+ }
+ if(version == null)
+ {
+ Console.WriteLine("Could not get version");
+ return 1;
+ }
+ else
+ {
+ var data = Json.Decode(FS.ReadAllText(FS.Local,"cross.json"));
+ if(TypeOf(data.dependencies) != "List") data.dependencies=[];
+ data.dependencies.Add({name,version});
+ FS.WriteAllText(FS.Local,"cross.json",Json.Encode(data,true));
+ }
+ }
+
}
else if(commandName == "upload-package")
{
diff --git a/Tesses.CrossLang.Std/cross.json b/Tesses.CrossLang.Std/cross.json
deleted file mode 100644
index 256df31..0000000
--- a/Tesses.CrossLang.Std/cross.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "info": {
- "type": "lib"
- },
- "version": "1.0.0.0-prod",
- "name": "Tesses.CrossLang.Std"
-}
\ No newline at end of file
diff --git a/Tesses.CrossLang.Std/src/time.tcross b/Tesses.CrossLang.Std/src/time.tcross
deleted file mode 100644
index dedeff1..0000000
--- a/Tesses.CrossLang.Std/src/time.tcross
+++ /dev/null
@@ -1,21 +0,0 @@
-func Time.Date.Create(year,month,day,hour,minute,second,timezone,hasDST)
-{
-
-}
-
-func Time.Date.FromUnix(timeStamp)
-{
- var seconds = (timeStamp % 60).Abs();
- var min = ((timeStamp / 60) % 60).Abs();
- var hour = ((timeStamp / 3600) % 24).Abs();
- var year = ((timeStamp / 31557600));
- var daysSince1970 = (timeStamp / 86400);
-
-
-
- return Time.Date.Create(,second);
-}
-func Time.Date.getNow()
-{
- return Time.Date.FromUnix(Time.Now);
-}
\ No newline at end of file
diff --git a/crosslang_shell_archive_maker/src/main.tcross b/crosslang_shell_archive_maker/src/main.tcross
index 793f07f..6cd34d3 100644
--- a/crosslang_shell_archive_maker/src/main.tcross
+++ b/crosslang_shell_archive_maker/src/main.tcross
@@ -52,6 +52,7 @@ func create_archive()
copyFile("Templates/lib/bin/Tesses.CrossLang.Template.Library-1.0.0.0-prod.crvm", templates / "lib.crvm");
copyFile("Templates/template/bin/Tesses.CrossLang.Template.Template-1.0.0.0-prod.crvm", templates / "template.crvm");
copyFile("Templates/web/bin/Tesses.CrossLang.Template.Website-1.0.0.0-prod.crvm", templates / "web.crvm");
+ copyFile("Templates/emptyweb/bin/Tesses.CrossLang.Template.EmptyWebsite-1.0.0.0-prod.crvm", templates / "emptyweb.crvm");
copyFile("Templates/tool/bin/Tesses.CrossLang.Template.Tool-1.0.0.0-prod.crvm", templates / "tool.crvm");
var packageCache = r / "PackageCache";
diff --git a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Args/1.0.0.0-prod b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Args/1.0.0.0-prod
index b7c1523..7e68b17 100644
Binary files a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Args/1.0.0.0-prod and b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Args/1.0.0.0-prod differ
diff --git a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.BuildEssentials/1.0.0.0-prod b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.BuildEssentials/1.0.0.0-prod
index 9fc76c2..cd68d2c 100644
Binary files a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.BuildEssentials/1.0.0.0-prod and b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.BuildEssentials/1.0.0.0-prod differ
diff --git a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Markup/1.0.0.0-prod b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Markup/1.0.0.0-prod
index 2bd97f3..ee8e141 100644
Binary files a/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Markup/1.0.0.0-prod and b/crosslang_shell_archive_maker/tmp/PackageCache/Tesses.CrossLang.Markup/1.0.0.0-prod differ
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 26825f8..0000000
--- a/install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-bash ./script.sh
-crossvm crosslang_shell_archive_maker/bin/crosslang_shell_archive_maker-1.0.0.0-prod.crvm install
diff --git a/pack.sh b/pack.sh
deleted file mode 100644
index 3207ff4..0000000
--- a/pack.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-bash ./script.sh
-crossvm crosslang_shell_archive_maker/bin/crosslang_shell_archive_maker-1.0.0.0-prod.crvm
\ No newline at end of file
diff --git a/script.sh b/script.sh
deleted file mode 100755
index bc9259b..0000000
--- a/script.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-cd Tesses.CrossLang.BuildEssentials && crossc -o ./bin-tmp -n Tesses.CrossLang.BuildEssentials -v 1.0.0.0-prod main.tcross src/*.tcross && cd ..
-crossvm ./Tesses.CrossLang.BuildEssentials/bin-tmp/Tesses.CrossLang.BuildEssentials-1.0.0.0-prod.crvm Tesses.CrossLang.Shell
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Tesses.CrossLang.PackageServer
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Tesses.CrossLang.WebSite
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/console
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/web
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/template
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/lib
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/compiletool
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build Templates/tool
-crossvm ./Tesses.CrossLang.Shell/bin/Tesses.CrossLang.Shell-1.0.0.0-prod.crvm build crosslang_shell_archive_maker
-