Skip to content

Commit 29ec634

Browse files
committed
Merge remote-tracking branch 'origin/netcore'
# Conflicts: # eFormAPI/eFormAPI/App_Start/AutofacConfig.cs # eFormAPI/eFormAPI/App_Start/Startup.Auth.cs # eFormAPI/eFormAPI/App_Start/SwaggerConfig.cs # eFormAPI/eFormAPI/App_Start/WebApiConfig.cs # eFormAPI/eFormAPI/Controllers/AccountController.cs # eFormAPI/eFormAPI/Controllers/AdminController.cs # eFormAPI/eFormAPI/Controllers/AuthController.cs # eFormAPI/eFormAPI/Controllers/CasesController.cs # eFormAPI/eFormAPI/Controllers/EntitySearchController.cs # eFormAPI/eFormAPI/Controllers/ImagesController.cs # eFormAPI/eFormAPI/Controllers/SettingsController.cs # eFormAPI/eFormAPI/Controllers/SimpleSitesController.cs # eFormAPI/eFormAPI/Controllers/SitesController.cs # eFormAPI/eFormAPI/Controllers/TagsController.cs # eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs # eFormAPI/eFormAPI/Controllers/UnitsController.cs # eFormAPI/eFormAPI/Controllers/WorkersController.cs # eFormAPI/eFormAPI/Global.asax.cs # eFormAPI/eFormAPI/Infrastructure/Helpers/CaseUpdateHelper.cs # eFormAPI/eFormAPI/Infrastructure/Helpers/PluginHelper.cs # eFormAPI/eFormAPI/Infrastructure/Helpers/SettingsHelper.cs # eFormAPI/eFormAPI/Infrastructure/Identity/EformRoleManager.cs # eFormAPI/eFormAPI/Infrastructure/Identity/EformSignInManager.cs # eFormAPI/eFormAPI/Infrastructure/Identity/EformUserManager.cs # eFormAPI/eFormAPI/Infrastructure/Identity/Providers/ApplicationOAuthProvider.cs # eFormAPI/eFormAPI/Infrastructure/Models/Settings/Admin/LoginPageSettingsModel.cs # eFormAPI/eFormAPI/Migrations/EformMigrationsConfiguration.cs # eFormAPI/eFormAPI/Web.config # eFormAPI/eFormAPI/eFormAPI.Web.csproj # eFormAPI/eFormAPI/eFormAPI.Web.csproj.user # eFormAPI/eFormAPI/packages.config
2 parents aee5362 + ba53a74 commit 29ec634

File tree

470 files changed

+21695
-10001
lines changed

Some content is hidden

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

470 files changed

+21695
-10001
lines changed

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,18 +361,18 @@ eFormAPI/eFormAPI/expection\.txt
361361

362362
\.DS_Store
363363

364-
eFormAPI/eFormAPI/Plugins/
364+
eform-client/src/app/plugins/
365365

366-
eFormAPI/EformBase\.Pn/Plugins/EformBase/
367366

368-
eFormAPI/Plugins/Vehicles\.Pn/Vehicles/
367+
eFormAPI/eFormAPI\.Web/API\.doc\.xml
368+
eFromAPI/eFormAPI\.Web/Plugins/
369+
eFromAPI/eFormAPI\.Web/output/
370+
eFromAPI/eFormAPI\.Web/dataFolder/
369371

370372

371-
eFormAPI/Plugins/
372-
eFormAPI/eFormAPI/Areas/HelpPage/HelpPage.css
373373

374-
eFormAPI/eFormAPI/output/
375-
eFormAPI/eFormAPI/dataFolder/
374+
eFormAPI/eFormAPI\.Web/Plugins/
376375

377-
eform-client/src/app/plugins/modules/customers-pn/
376+
eFormAPI/eFormAPI\.Web/output/
377+
FormAPI/eFormAPI.Web/appsettings.json
378378

.travis.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,42 @@
11
dist: trusty
22
addons:
33
firefox: latest
4+
chrome: stable
45
apt:
56
sources:
67
- google-chrome
78
packages:
89
- google-chrome-stable fluxbox
910
sudo: required
1011
language: csharp
11-
mono: latest
12-
dotnet: 2.0.0
13-
install:
14-
- nvm install 8.0.0
15-
- nvm use 8.0.0
12+
mono: none
13+
dotnet: 2.1
14+
bundler_args: --retry 5
15+
before_install:
16+
- google-chrome-stable --headless --disable-gpu
17+
install:
18+
- nvm install 8.14.0
19+
- nvm use 8.14.0
20+
- npm install
1621
before_script:
1722
- "export DISPLAY=:99.0"
1823
- "sh -e /etc/init.d/xvfb start"
1924
- sleep 3
2025
- fluxbox > /dev/null 2>&1 &
2126
script:
22-
- cd eform-client && npm install
27+
- dotnet restore -v q eFormAPI/eFormAPI.sln
28+
- dotnet build eFormAPI/eFormAPI.sln
29+
- dotnet test -v n eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj
30+
- dotnet test -v n eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj
31+
- cd eform-client && npm install
32+
- npm start &
33+
- sleep 30
34+
- dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj &
35+
- sleep 10
36+
- npm run testheadless
37+
- dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj &
38+
- sleep 30
39+
- npm run testheadless2
2340
after_success:
2441
- echo dotnet test and npm test succeeded
2542
after_faliure:

docs/Linux/install.md

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# eFrom installation script
2+
3+
## Preparing
4+
5+
Recommended distributive - __Ubuntu 18.04__
6+
7+
### Swapfile
8+
9+
If you have 1Gb and less RAM on server/PC, you need to configure swap on system
10+
11+
Run __cat__ to check does your system have a swap file
12+
13+
```bash
14+
cat /proc/swaps
15+
```
16+
17+
If no swap file or partition is available - you can create swapfile with commands below
18+
19+
```bash
20+
sudo fallocate -l 4G /swapfile
21+
sudo chmod 600 /swapfile
22+
sudo mkswap /swapfile
23+
sudo swapon /swapfile
24+
echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
25+
```
26+
27+
### Create non-root user
28+
29+
Script should be launched via Non-root user via sudo.
30+
31+
Exec adduser to create new user in system
32+
33+
```bash
34+
adduser eformuser
35+
```
36+
37+
Give sudo privileges to user
38+
39+
```bash
40+
usermod -aG sudo eformuser
41+
```
42+
43+
logout and login to created user
44+
45+
if you are in root, you can run __su__ to login as new user
46+
47+
```bash
48+
su - eformuser
49+
```
50+
51+
### Downloading script
52+
53+
Use wget to download script
54+
55+
```bash
56+
wget https://raw.githubusercontent.com/microting/eform-angular-frontend/netcore/install.sh
57+
```
58+
59+
Make script executable
60+
61+
```bash
62+
sudo chmod +x install.sh
63+
```
64+
65+
## Running script
66+
67+
Launch script with command
68+
69+
```bash
70+
sudo ./install.sh
71+
```
72+
73+
You should see this window:
74+
![Install](main_script_window.png "Install")
75+
76+
Configuration wizard ask you a 4 parameters to setup
77+
78+
* Username
79+
* Non-root username who launched that script
80+
(used for building app at your home directory)
81+
* Hostname
82+
* Hostname that NGINX should use as route to webapp
83+
* Leave blank for localhost path
84+
* __Example__: myeform.com
85+
* Launch environment:
86+
* Which launching environment should use dotnet
87+
* __Available values__: _Development_, _Production_
88+
* __Default value__: _Production_
89+
* Leave default value if you plan to work only with eForm dashboard
90+
* Port
91+
* Defines on which port application will be available
92+
* __Default value__: 80
93+
94+
## Installation process
95+
96+
All installation process is automated, after installation eFrom application will be available on host and port that you specified in configuration
97+
98+
## Error solving
99+
100+
If app is not launched or something missing - check __errlog__ file for more info about installation process

docs/Linux/main_script_window.png

18.9 KB
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)