Skip to content
This repository has been archived by the owner on Oct 14, 2023. It is now read-only.

Commit

Permalink
Updates to Terbium (Coming soon to other apps)
Browse files Browse the repository at this point in the history
  • Loading branch information
Notplayingallday383 committed Jun 18, 2023
1 parent f3ae5c9 commit efc352d
Show file tree
Hide file tree
Showing 17 changed files with 1,460 additions and 971 deletions.
32 changes: 24 additions & 8 deletions .github/workflows/nightly_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,23 @@ jobs:
git tag -a -F tag.txt "z1g-hub-nightly-${{ steps.date.outputs.date }}"
git push origin "z1g-hub-nightly-${{ steps.date.outputs.date }}"
- name: Upload compiled ZIP as tag asset
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "z1g-hub-nightly-${{ steps.date.outputs.date }}"
release_name: "Nightly Build - ${{ steps.date.outputs.date }}"
draft: false
prerelease: false

- name: Upload compiled ZIP as release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ steps.create_tag.outputs.id }}/assets{?name,label}
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: compiled-zips/z1g-project-hub.zip
asset_name: z1g-project-hub.zip
asset_content_type: application/zip
Expand All @@ -59,9 +70,14 @@ jobs:
changelog=$(cat nightlychangelogs.md)
echo "::set-output name=changelog::$changelog"
- name: Update tag description with changelog
run: |
git fetch --tags
tag_sha=$(git rev-list -n 1 "z1g-hub-nightly-${{ steps.date.outputs.date }}")
git tag -a -f -m "${{ steps.changelog.outputs.changelog }}" "${{ steps.date.outputs.date }}" $tag_sha
git push --tags
- name: Update release description with changelog
uses: actions/github-script@v4
with:
script: |
const changelog = `Release Changelog:\n\n${{ steps.changelog.outputs.changelog }}`;
github.repos.updateRelease({
owner: context.repo.owner,
repo: context.repo.repo,
release_id: ${{ steps.create_release.outputs.id }},
body: changelog
});
3 changes: 3 additions & 0 deletions Terbium/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
<setting name="DefualtFont" serializeAs="String">
<value>Segoe UI, 9pt</value>
</setting>
<setting name="versionurl" serializeAs="String">
<value>https://terbium-46q.pages.dev</value>
</setting>
</Terbium.Properties.Settings>
</userSettings>
</configuration>
335 changes: 163 additions & 172 deletions Terbium/Form1.Designer.cs

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions Terbium/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,9 @@ private void InitializeCefSharp()

private async void Form1_Load(object sender, EventArgs e)
{
string url = "";
chromiumWebBrowser1.Load(Properties.Settings.Default.versionurl);
string terbiumVerUrl = "https://cdn.z1g-project.repl.co/z1g-hub/client/terbium-ver.txt";
string terbiumHomePage = "https://terbium-46q.pages.dev";
string terbiumFallbackPage = "https://terbium--johnglynn2.repl.co";
string setupDoneFile = "C:/z1g apps/Terbium/Data/setupdone.DAT";
string verConfFile = "C:/z1g apps/Terbium/Data/verconf.DAT";

try
{
Expand All @@ -142,22 +139,21 @@ private async void Form1_Load(object sender, EventArgs e)
firstrun firstrun = new firstrun();
firstrun.Show();
chromiumWebBrowser1.Load("about:blank");
return; // Stop execution after showing the firstrun form
}
}
else
{
getupdates getupdates = new getupdates();
getupdates.Show();
return; // Stop execution after showing the getupdates form
}
}
}
catch (Exception ex)
{
MessageBox.Show("An error occurred while checking for updates: " + ex.Message);
url = File.Exists(verConfFile) ? terbiumHomePage : terbiumFallbackPage;
}

chromiumWebBrowser1.Load(url);
}

private void panel1_MouseDown(object sender, MouseEventArgs e)
Expand Down
62 changes: 61 additions & 1 deletion Terbium/Form1.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,64 @@
<root>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
Expand Down
14 changes: 13 additions & 1 deletion Terbium/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Terbium/Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@
<Setting Name="DefualtFont" Type="System.String" Scope="User">
<Value Profile="(Default)">Segoe UI, 9pt</Value>
</Setting>
<Setting Name="versionurl" Type="System.String" Scope="User">
<Value Profile="(Default)">https://terbium-46q.pages.dev</Value>
</Setting>
</Settings>
</SettingsFile>
2 changes: 1 addition & 1 deletion Terbium/Terbium.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x64</Platforms>
<ApplicationIcon>terbium.ico</ApplicationIcon>
<Version>1.5.0.0</Version>
<Version>2.0.0.0</Version>
<Company>z1g Project</Company>
<Copyright>(C) Copyright 2023 z1g Project</Copyright>
</PropertyGroup>
Expand Down
Loading

0 comments on commit efc352d

Please sign in to comment.