Skip to content

Commit 3484c6c

Browse files
hallamwhallamw
committed
Doing demo
1 parent fadd840 commit 3484c6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+13273
-23
lines changed

‎.dockerignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
**/.classpath
2+
**/.dockerignore
3+
**/.env
4+
**/.git
5+
**/.gitignore
6+
**/.project
7+
**/.settings
8+
**/.toolstarget
9+
**/.vs
10+
**/.vscode
11+
**/*.*proj.user
12+
**/*.dbmdl
13+
**/*.jfm
14+
**/azds.yaml
15+
**/bin
16+
**/charts
17+
**/docker-compose*
18+
**/Dockerfile*
19+
**/node_modules
20+
**/npm-debug.log
21+
**/obj
22+
**/secrets.dev.yaml
23+
**/values.dev.yaml
24+
LICENSE
25+
README.md

‎LorryLog/LorryLog.sqlproj

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<Build Include="Vehicle.sql" />
62+
<Build Include="Pickup.sql" />
6263
</ItemGroup>
6364
<ItemGroup>
6465
<RefactorLog Include="LorryLog.refactorlog" />

‎LorryLog/Pickup.sql

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
CREATE TABLE [dbo].[Pickup]
2+
(
3+
[Id] INT NOT NULL IDENTITY(1,1),
4+
[FromAddress] NVARCHAR(100) NOT NULL,
5+
[ToAddress] NVARCHAR(100) NOT NULL,
6+
[SignatureRequired] BIT NOT NULL,
7+
[PickedUp] DATETIME,
8+
[Delivered] DATETIME,
9+
[Barcode] NVARCHAR(30)
10+
CONSTRAINT [PK_Pickup] PRIMARY KEY CLUSTERED
11+
(
12+
[Id] ASC
13+
)
14+
)

‎LorryLogAPI/Properties/launchSettings.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
{
2-
"$schema": "http://json.schemastore.org/launchsettings.json",
1+
{
32
"iisSettings": {
43
"windowsAuthentication": false,
54
"anonymousAuthentication": true,
65
"iisExpress": {
76
"applicationUrl": "http://localhost:61851",
8-
"sslPort": 44340
7+
"sslPort": 0
98
}
109
},
10+
"$schema": "http://json.schemastore.org/launchsettings.json",
1111
"profiles": {
1212
"IIS Express": {
1313
"commandName": "IISExpress",
1414
"launchBrowser": true,
15-
"launchUrl": "weatherforecast",
15+
"launchUrl": "vehicles",
1616
"environmentVariables": {
1717
"ASPNETCORE_ENVIRONMENT": "Development"
1818
}
@@ -21,10 +21,10 @@
2121
"commandName": "Project",
2222
"launchBrowser": true,
2323
"launchUrl": "weatherforecast",
24-
"applicationUrl": "https://localhost:5001;http://localhost:5000",
2524
"environmentVariables": {
2625
"ASPNETCORE_ENVIRONMENT": "Development"
27-
}
26+
},
27+
"applicationUrl": "https://localhost:5001;http://localhost:5000"
2828
}
2929
}
30-
}
30+
}

‎LorryLogAPI/Startup.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public Startup(IConfiguration configuration)
2727

2828
public void ConfigureServices(IServiceCollection services)
2929
{
30-
30+
services.AddControllers();
3131
services.AddDbContext<LorryLogAPIContext>(options =>
3232
options.UseSqlServer(Configuration.GetConnectionString("LorryLogAPIContext")));
3333
}
@@ -42,7 +42,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4242

4343
app.UseRouting();
4444

45-
app.UseAuthorization();
45+
//app.UseAuthorization();
4646

4747
app.UseEndpoints(endpoints =>
4848
{

‎LorryLogAdmin/.config/dotnet-tools.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-ef": {
6+
"version": "3.1.2",
7+
"commands": [
8+
"dotnet-ef"
9+
]
10+
}
11+
}
12+
}

‎LorryLogAdmin/Properties/launchSettings.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{
1+
{
22
"iisSettings": {
3-
"windowsAuthentication": false,
4-
"anonymousAuthentication": true,
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
55
"iisExpress": {
66
"applicationUrl": "http://localhost:50027",
7-
"sslPort": 44352
7+
"sslPort": 0
88
}
99
},
1010
"profiles": {
@@ -18,10 +18,10 @@
1818
"LorryLogAdmin": {
1919
"commandName": "Project",
2020
"launchBrowser": true,
21-
"applicationUrl": "https://localhost:5001;http://localhost:5000",
2221
"environmentVariables": {
2322
"ASPNETCORE_ENVIRONMENT": "Development"
24-
}
23+
},
24+
"applicationUrl": "https://localhost:5001;http://localhost:5000"
2525
}
2626
}
27-
}
27+
}

‎LorryLogAdmin/appsettings.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
},
99
"AllowedHosts": "*",
1010
"ConnectionStrings": {
11-
"LorryLogAdminContext": "Server=(localdb)\\mssqllocaldb;Database=LorryLogAdminContext-b033c963-35e3-4839-99a8-b87107c01f76;Trusted_Connection=True;MultipleActiveResultSets=true",
1211
"LorryLogAPI_URL": "https://lorrylogapi.azurewebsites.net/"
1312
}
1413
}

‎LorryLogger.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LorryModels", "LorryModels\
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LorryTests", "LorryTests\LorryTests.csproj", "{18C6FF4F-32EB-4745-AE6F-270DDA6BDED2}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LorryLogAdmin", "LorryLogAdmin\LorryLogAdmin.csproj", "{C9B0D50F-C92A-4243-A39C-3452B1402329}"
13-
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LorryLogAPI", "LorryLogAPI\LorryLogAPI.csproj", "{866631E8-3824-424B-9A09-6521724814F2}"
1513
EndProject
1614
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B820AD94-F511-49C3-A6C6-385856D905D8}"
@@ -19,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1917
azure-pipelines-lorrylogapi.yml = azure-pipelines-lorrylogapi.yml
2018
EndProjectSection
2119
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LorryLogAdmin", "LorryLogAdmin\LorryLogAdmin.csproj", "{CCC8776A-C7B7-4366-B63C-D4E5E54664FE}"
21+
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2424
Debug|Any CPU = Debug|Any CPU
@@ -39,14 +39,14 @@ Global
3939
{18C6FF4F-32EB-4745-AE6F-270DDA6BDED2}.Debug|Any CPU.Build.0 = Debug|Any CPU
4040
{18C6FF4F-32EB-4745-AE6F-270DDA6BDED2}.Release|Any CPU.ActiveCfg = Release|Any CPU
4141
{18C6FF4F-32EB-4745-AE6F-270DDA6BDED2}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{C9B0D50F-C92A-4243-A39C-3452B1402329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{C9B0D50F-C92A-4243-A39C-3452B1402329}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{C9B0D50F-C92A-4243-A39C-3452B1402329}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{C9B0D50F-C92A-4243-A39C-3452B1402329}.Release|Any CPU.Build.0 = Release|Any CPU
4642
{866631E8-3824-424B-9A09-6521724814F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4743
{866631E8-3824-424B-9A09-6521724814F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
4844
{866631E8-3824-424B-9A09-6521724814F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
4945
{866631E8-3824-424B-9A09-6521724814F2}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{CCC8776A-C7B7-4366-B63C-D4E5E54664FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{CCC8776A-C7B7-4366-B63C-D4E5E54664FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{CCC8776A-C7B7-4366-B63C-D4E5E54664FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{CCC8776A-C7B7-4366-B63C-D4E5E54664FE}.Release|Any CPU.Build.0 = Release|Any CPU
5050
EndGlobalSection
5151
GlobalSection(SolutionProperties) = preSolution
5252
HideSolutionNode = FALSE

‎LorryMobile/LorryMobile.Android/Assets/AboutAssets.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Any raw assets you want to be deployed with your application can be placed in
2+
this directory (and child directories) and given a Build Action of "AndroidAsset".
3+
4+
These files will be deployed with your package and will be accessible using Android's
5+
AssetManager, like this:
6+
7+
public class ReadAsset : Activity
8+
{
9+
protected override void OnCreate (Bundle bundle)
10+
{
11+
base.OnCreate (bundle);
12+
13+
InputStream input = Assets.Open ("my_asset.txt");
14+
}
15+
}
16+
17+
Additionally, some Android functions will automatically load asset files:
18+
19+
Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

‎LorryMobile/LorryMobile.Android/LorryMobile.Android.csproj

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{A9ADE1DC-66D1-4035-868B-FDC39A875A58}</ProjectGuid>
7+
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<TemplateGuid>{9AA2D3C6-3393-45F1-8E7C-5A9901728795}</TemplateGuid>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>LorryMobile.Droid</RootNamespace>
11+
<AssemblyName>LorryMobile.Android</AssemblyName>
12+
<AndroidApplication>True</AndroidApplication>
13+
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
14+
<AndroidResgenClass>Resource</AndroidResgenClass>
15+
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
16+
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
17+
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18+
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
19+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
20+
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
21+
<AndroidUseAapt2>true</AndroidUseAapt2>
22+
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
23+
<NuGetPackageImportStamp>
24+
</NuGetPackageImportStamp>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
27+
<DebugSymbols>true</DebugSymbols>
28+
<DebugType>portable</DebugType>
29+
<Optimize>false</Optimize>
30+
<OutputPath>bin\Debug</OutputPath>
31+
<DefineConstants>DEBUG;</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
<AndroidLinkMode>None</AndroidLinkMode>
35+
</PropertyGroup>
36+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
37+
<DebugSymbols>true</DebugSymbols>
38+
<DebugType>portable</DebugType>
39+
<Optimize>true</Optimize>
40+
<OutputPath>bin\Release</OutputPath>
41+
<ErrorReport>prompt</ErrorReport>
42+
<WarningLevel>4</WarningLevel>
43+
<AndroidManagedSymbols>true</AndroidManagedSymbols>
44+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Reference Include="Mono.Android" />
48+
<Reference Include="System" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="System.Numerics" />
51+
<Reference Include="System.Numerics.Vectors" />
52+
<Reference Include="System.Xml.Linq" />
53+
<Reference Include="System.Xml" />
54+
</ItemGroup>
55+
<ItemGroup>
56+
<PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
57+
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
58+
</ItemGroup>
59+
<ItemGroup>
60+
<Compile Include="MainActivity.cs" />
61+
<Compile Include="Resources\Resource.designer.cs" />
62+
<Compile Include="Properties\AssemblyInfo.cs" />
63+
</ItemGroup>
64+
<ItemGroup>
65+
<None Include="Resources\AboutResources.txt" />
66+
<None Include="Assets\AboutAssets.txt" />
67+
<None Include="Properties\AndroidManifest.xml" />
68+
</ItemGroup>
69+
<ItemGroup>
70+
<AndroidResource Include="Resources\layout\Tabbar.xml" />
71+
<AndroidResource Include="Resources\layout\Toolbar.xml" />
72+
<AndroidResource Include="Resources\values\styles.xml" />
73+
<AndroidResource Include="Resources\values\colors.xml" />
74+
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
75+
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
76+
<AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
77+
<AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
78+
<AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
79+
<AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
80+
<AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
81+
<AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
82+
<AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
83+
<AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
84+
<AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
85+
<AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
86+
<AndroidResource Include="Resources\drawable\xamarin_logo.png" />
87+
</ItemGroup>
88+
<ItemGroup>
89+
<ProjectReference Include="..\LorryMobile\LorryMobile.csproj">
90+
<Project>{CF9C4D99-1557-49F2-8F96-381A59A421C3}</Project>
91+
<Name>LorryMobile</Name>
92+
</ProjectReference>
93+
</ItemGroup>
94+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
95+
</Project>

‎LorryMobile/LorryMobile.Android/MainActivity.cs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System;
2+
3+
using Android.App;
4+
using Android.Content.PM;
5+
using Android.Runtime;
6+
using Android.Views;
7+
using Android.Widget;
8+
using Android.OS;
9+
10+
namespace LorryMobile.Droid
11+
{
12+
[Activity(Label = "LorryMobile", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
13+
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
14+
{
15+
protected override void OnCreate(Bundle savedInstanceState)
16+
{
17+
TabLayoutResource = Resource.Layout.Tabbar;
18+
ToolbarResource = Resource.Layout.Toolbar;
19+
20+
base.OnCreate(savedInstanceState);
21+
22+
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
23+
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
24+
LoadApplication(new App());
25+
}
26+
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
27+
{
28+
Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
29+
30+
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
31+
}
32+
}
33+
}

‎LorryMobile/LorryMobile.Android/Properties/AndroidManifest.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.lorrymobile">
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
4+
<application android:label="LorryMobile.Android"></application>
5+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6+
</manifest>

‎LorryMobile/LorryMobile.Android/Properties/AssemblyInfo.cs

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
using Android.App;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("LorryMobile.Android")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("")]
13+
[assembly: AssemblyProduct("LorryMobile.Android")]
14+
[assembly: AssemblyCopyright("Copyright © 2014")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
[assembly: ComVisible(false)]
18+
19+
// Version information for an assembly consists of the following four values:
20+
//
21+
// Major Version
22+
// Minor Version
23+
// Build Number
24+
// Revision
25+
//
26+
// You can specify all the values or you can default the Build and Revision Numbers
27+
// by using the '*' as shown below:
28+
// [assembly: AssemblyVersion("1.0.*")]
29+
[assembly: AssemblyVersion("1.0.0.0")]
30+
[assembly: AssemblyFileVersion("1.0.0.0")]
31+
32+
// Add some common permissions, these can be removed if not needed
33+
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
34+
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]

0 commit comments

Comments
 (0)