Skip to content

Commit 899bf4c

Browse files
ghost1372ghost1372
committed
add error field
1 parent 0045dde commit 899bf4c

File tree

14 files changed

+114
-14
lines changed

14 files changed

+114
-14
lines changed

‎CodeHubDesktop/CodeHubDesktop.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Version>1.0.0.0</Version>
99
<Configurations>Debug;Release</Configurations>
1010
<Copyright>Copyright © Mahdi 2018-2020</Copyright>
11-
<FileVersion>1.0.0.0</FileVersion>
12-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
11+
<FileVersion>1.0.1.0</FileVersion>
12+
<AssemblyVersion>1.0.1.0</AssemblyVersion>
1313
<LangVersion>latest</LangVersion>
1414
<SatelliteResourceLanguages>en;fa;en-US;fa-IR</SatelliteResourceLanguages>
1515
<ApplicationIcon>gitbanner_6jm_icon.ico</ApplicationIcon>

‎CodeHubDesktop/Data/AppConfig.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ internal class AppConfig
88
public static readonly string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json";
99

1010
public string Lang { get; set; } = "fa-IR";
11+
public string APIBaseAddress { get; set; } = "http://codehub.pythonanywhere.com/api/v1/snippet/";
1112
public bool IsModernStyle { get; set; } = false;
1213
public bool StoreSnippet { get; set; } = false;
1314
public SkinType Skin { get; set; } = SkinType.Default;

‎CodeHubDesktop/Models/APISnippetModel.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class CreateSnippetModel
66
public string detail { get; set; }
77
public string script { get; set; }
88
public string language { get; set; }
9+
public string error { get; set; }
910
}
1011

1112
public class GetSnippetModel
@@ -17,5 +18,6 @@ public class GetSnippetModel
1718
public string language { get; set; }
1819
public string pub_date { get; set; }
1920
public string link { get; set; }
21+
public string error { get; set; }
2022
}
2123
}

‎CodeHubDesktop/Models/SnippetsModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ public class SnippetsModel : DomainObject
88
public string Language { get; set; }
99
public string PubDate { get; set; }
1010
public string Link { get; set; }
11+
public string Error { get; set; }
1112
}
1213
}

‎CodeHubDesktop/MultiLanguage/Language/Lang.Designer.cs‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeHubDesktop/MultiLanguage/Language/Lang.fa-IR.resx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@
129129
<data name="AdminErrorTitle" xml:space="preserve">
130130
<value>خطای دسترسی</value>
131131
</data>
132+
<data name="APIUrl" xml:space="preserve">
133+
<value>آدرس ای پی آی را وارد کنید...</value>
134+
</data>
135+
<data name="APIUrlTitle" xml:space="preserve">
136+
<value>آدرس ای پی آی</value>
137+
</data>
132138
<data name="ChangeLanguage" xml:space="preserve">
133139
<value>آیا مایل به تغییر زبان برنامه هستید؟</value>
134140
</data>
@@ -195,6 +201,12 @@
195201
<data name="DownloadNewVer" xml:space="preserve">
196202
<value>دانلود بروزرسانی جدید</value>
197203
</data>
204+
<data name="Error" xml:space="preserve">
205+
<value>خطا...</value>
206+
</data>
207+
<data name="ErrorTitle" xml:space="preserve">
208+
<value>متن خطا</value>
209+
</data>
198210
<data name="General" xml:space="preserve">
199211
<value>عمومی</value>
200212
</data>

‎CodeHubDesktop/MultiLanguage/Language/Lang.resx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ Desktop Version Work with CodeHub API.</value>
130130
<data name="AdminErrorTitle" xml:space="preserve">
131131
<value>Administrator Access Error</value>
132132
</data>
133+
<data name="APIUrl" xml:space="preserve">
134+
<value>Enter API Url...</value>
135+
</data>
136+
<data name="APIUrlTitle" xml:space="preserve">
137+
<value>API Url</value>
138+
</data>
133139
<data name="ChangeLanguage" xml:space="preserve">
134140
<value>Do you want to change language?</value>
135141
</data>
@@ -196,6 +202,12 @@ Desktop Version Work with CodeHub API.</value>
196202
<data name="DownloadNewVer" xml:space="preserve">
197203
<value>Download New Update</value>
198204
</data>
205+
<data name="Error" xml:space="preserve">
206+
<value>Error...</value>
207+
</data>
208+
<data name="ErrorTitle" xml:space="preserve">
209+
<value>Error</value>
210+
</data>
199211
<data name="General" xml:space="preserve">
200212
<value>General</value>
201213
</data>

‎CodeHubDesktop/ViewModels/CreateSnippetViewModel.cs‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ namespace CodeHubDesktop.ViewModels
1414
{
1515
public class CreateSnippetViewModel : BindableBase
1616
{
17+
private string _Error;
18+
public string Error
19+
{
20+
get => _Error;
21+
set => SetProperty(ref _Error, value);
22+
}
1723
private string _SnippetUrl;
1824
public string SnippetUrl
1925
{
@@ -83,20 +89,20 @@ private async void OnCreateSnippet()
8389
title = Subject,
8490
detail = Detail,
8591
language = SelectedCode.ToLower(),
86-
script = Snippet
92+
script = Snippet,
93+
error = Error
8794
};
8895

8996
string json = JsonConvert.SerializeObject(snippet);
9097
StringContent data = new StringContent(json, Encoding.UTF8, "application/json");
91-
string url = "http://codehub.pythonanywhere.com/api/v1/snippet/";
98+
string url = GlobalData.Config.APIBaseAddress;
9299

93100
using HttpClient client = new HttpClient();
94101
HttpResponseMessage response = await client.PostAsync(url, data);
95102

96103
string result = response.Content.ReadAsStringAsync().Result;
97104
GetSnippetModel parse = JsonConvert.DeserializeObject<GetSnippetModel>(result);
98105
SnippetUrl = parse.link;
99-
IsEnabled = true;
100106
if (GlobalData.Config.StoreSnippet)
101107
{
102108
SnippetsModel entity = new SnippetsModel
@@ -107,22 +113,27 @@ private async void OnCreateSnippet()
107113
Link = parse.link,
108114
PubDate = parse.pub_date,
109115
Script = parse.script,
110-
SId = parse.SID
116+
SId = parse.SID,
117+
Error = parse.error
111118
};
112119
IDataService<SnippetsModel> dataService = new GenericDataService<SnippetsModel>();
113120
await dataService.CreateSnippet(entity);
114121
}
122+
IsEnabled = true;
115123
}
116124
catch (Exception ex)
117125
{
118-
119126
Growl.Error(ex.Message);
120127
}
128+
finally
129+
{
130+
IsEnabled = true;
131+
}
121132
}
122133

123134
private void OnClear()
124135
{
125-
Snippet = Subject = Detail = string.Empty;
136+
Error = Snippet = Subject = Detail = string.Empty;
126137
}
127138

128139
internal void FillComboBox()

‎CodeHubDesktop/ViewModels/SettingsViewModel.cs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ namespace CodeHubDesktop.ViewModels
66
{
77
public class SettingsViewModel : BindableBase
88
{
9-
public static SettingsViewModel Instance;
9+
private string _APIUrlText;
10+
public string APIUrlText
11+
{
12+
get => _APIUrlText;
13+
set
14+
{
15+
GlobalData.Config.APIBaseAddress = value;
16+
GlobalData.Save();
17+
SetProperty(ref _APIUrlText, value);
18+
}
19+
}
20+
1021
private HorizontalAlignment _ContentAlignment;
1122
public HorizontalAlignment ContentAlignment
1223
{
@@ -25,10 +36,10 @@ public bool GetIsCheckedToggle
2536

2637
public SettingsViewModel()
2738
{
28-
Instance = this;
2939
StoreSnippetCommand = new DelegateCommand<object>(OnStoreSnippet);
3040

3141
GetIsCheckedToggle = GlobalData.Config.StoreSnippet;
42+
APIUrlText = GlobalData.Config.APIBaseAddress;
3243
}
3344

3445
private void OnStoreSnippet(object isChecked)

‎CodeHubDesktop/ViewModels/SnippetHistoryViewModel.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ namespace CodeHubDesktop.ViewModels
2020
public class SnippetHistoryViewModel : BindableBase
2121
{
2222
#region OnlineSnipet
23+
24+
private string _Error;
25+
public string Error
26+
{
27+
get => _Error;
28+
set => SetProperty(ref _Error, value);
29+
}
2330
private string _SearchText;
2431
public string SearchText
2532
{
@@ -178,7 +185,7 @@ private async void OnSearchStarted(FunctionEventArgs<string> e)
178185
}
179186
else
180187
{
181-
url = $"http://codehub.pythonanywhere.com/api/v1/snippet/{SearchText}";
188+
url = GlobalData.Config.APIBaseAddress + SearchText;
182189
}
183190
using HttpClient client = new HttpClient();
184191
HttpResponseMessage response = await client.GetAsync(url);
@@ -191,6 +198,7 @@ private async void OnSearchStarted(FunctionEventArgs<string> e)
191198
SnippetScript = parse.script;
192199
SnippetUrl = parse.link;
193200
SnippetLanguage = parse.language;
201+
Error = parse.error;
194202
PanelVisibility = Visibility.Visible;
195203
}
196204
catch (Exception ex)

0 commit comments

Comments
 (0)