Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
543f701
updated everything (functiontests pending)
knoxfighter Jul 21, 2018
25d1471
ignored map file
knoxfighter Jul 21, 2018
5d7a1bb
finished workcheck
knoxfighter Jul 21, 2018
f5bc114
added sass compiler
knoxfighter Jul 21, 2018
c8e2389
updated code (currently working ... more or less)
knoxfighter Aug 6, 2018
a202bdb
removed DS-Sore files
knoxfighter Aug 6, 2018
b403032
Merge branch 'master' into Feature/update-everything
knoxfighter Aug 6, 2018
89a756e
Merge branch 'bugfix/modupload' into Feature/update-everything
knoxfighter Aug 6, 2018
ab432a6
added bootstrap fileinput to dependencies && changed laravel mix dir
knoxfighter Aug 6, 2018
6f5f5c6
moved icons into image folder
knoxfighter Aug 6, 2018
a940971
removed old not used files
knoxfighter Aug 6, 2018
c7bdc8a
updated packages again
knoxfighter Aug 6, 2018
f128b4b
fixed breadcrumbs
knoxfighter Aug 7, 2018
1e37340
fixed boxes and collapse in Mods-Section
knoxfighter Aug 8, 2018
5373de3
chenged Disabled/Enabled to badges
knoxfighter Aug 8, 2018
9767809
fixed heading sizes
knoxfighter Aug 8, 2018
c823a9d
fixed heading sizes
knoxfighter Aug 8, 2018
8f99c0c
readded font-awesome
knoxfighter Aug 8, 2018
a42a85d
Merge remote-tracking branch 'origin/Feature/update-everything' into …
knoxfighter Aug 8, 2018
fcb272f
fixed arrow and minus not changing
knoxfighter Aug 9, 2018
eecc5ac
fixed serverControl design
knoxfighter Aug 9, 2018
6b7983c
fixed Logs and Saves design
knoxfighter Aug 9, 2018
90d5df5
adjust table design
knoxfighter Aug 9, 2018
1740434
updated to sweetalert2 (only Saves reimplemented)
knoxfighter Aug 10, 2018
d5e1852
removed js-alert to swal
knoxfighter Aug 10, 2018
d59a984
changed swal to swal2 in SavesList
knoxfighter Aug 10, 2018
72236f4
changed swal to swal2 in ServerControls
knoxfighter Aug 10, 2018
d397ca2
changed swal to swal2 in ModsContent && updated to fontawesome 5
knoxfighter Aug 11, 2018
b679415
changed swal to swal2 in ModsContent 2
knoxfighter Aug 11, 2018
88cf32d
changed swal to swal2 in ModLoadSave
knoxfighter Aug 11, 2018
e68fab4
fixed ModLoadSave Swal design
knoxfighter Aug 11, 2018
2e5ad41
changed swal to swal2 in ModPacks
knoxfighter Aug 11, 2018
c306182
fixed collapse on ModPacks
knoxfighter Aug 11, 2018
5b9b3c9
updated again :)
knoxfighter Aug 11, 2018
6fc68ab
fixed buggy footer desig
knoxfighter Aug 11, 2018
eb112d4
made custom FontAwesome Component
knoxfighter Aug 11, 2018
b0ffa11
fixed not showing fontawesome icons
knoxfighter Aug 11, 2018
5bbaa28
rebuild adminLTE skin-blue
knoxfighter Aug 11, 2018
935bd34
fixed navigation margin
knoxfighter Aug 11, 2018
fdeef27
fixed loader not shown
knoxfighter Aug 11, 2018
598e499
added new laravel-mix section to readme
knoxfighter Aug 12, 2018
283f370
Merge branch 'master' of github.com:knoxfighter/factorio-server-manag…
knoxfighter Aug 12, 2018
62c469e
made js build with webpack only (scss, ... still missing)
knoxfighter Aug 20, 2018
56e8d67
made use of webpacks alias
knoxfighter Aug 20, 2018
47b9bf6
adding scss-compilation (broken)
knoxfighter Aug 20, 2018
179e1c2
more testing and cleanup webpack config
knoxfighter Aug 24, 2018
a6785c6
added resolve-url-loader
knoxfighter Aug 28, 2018
d33929d
fixed webpack-filepaths, so relative paths are generated
knoxfighter Aug 29, 2018
5bd9533
added workaround for creating js-files for extracted css.
knoxfighter Aug 29, 2018
978b759
reenabled compile of js-files
knoxfighter Aug 29, 2018
282c8be
enabled sourceMaps
knoxfighter Aug 29, 2018
d8e2143
removed last laravel-file
knoxfighter Aug 29, 2018
dc35cff
reworked npm scripts
knoxfighter Aug 29, 2018
7b8311e
updated to babel 7
knoxfighter Aug 29, 2018
a22d1f6
added prop-types-version
knoxfighter Aug 29, 2018
c73f14c
added css-minification
knoxfighter Aug 29, 2018
7e16fd7
updated file-loader and webpack-style-fix
knoxfighter Aug 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
node_modules/
dev/
bundle.js
factorio-server-manager
factorio_server_manager
/factorio-server-manager*
/factorio_server_manager*
auth.leveldb*
conf.json
*.exe
build/
/mod_packs/*
npm-debug.log
.idea/
/ui/package-lock.json
/package-lock.json
factorio.auth
/pkg/
mix-manifest.json
/app/**/vendor/
/app/*.js*
/app/*.css*
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ build/factorio-server-manager-%.zip: app/bundle.js factorio-server-manager-%
@zip -r $@ factorio-server-manager > /dev/null
@rm -r factorio-server-manager

app/bundle.js:
app/bundle:
@echo "Building Frontend"
@cd ui && npm install && npm run build
@npm install && npm run build

factorio-server-manager-linux: godeps
@echo "Building Backend - Linux"
Expand All @@ -47,3 +47,6 @@ clean:
@echo "Cleaning"
@rm -r build/
@rm app/bundle.js
@rm app/bundle.css
@rm app/fonts/vendor
@rm app/images/vendor
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,27 @@ make
```

#### Building the React Frontend alone
Frontend is built using React and the AdminLTE CSS framework. See app/dist/ for AdminLTE included files and license.
Frontend is built using React and the AdminLTE CSS framework.

The root of the UI application is served at app/index.html. Run the npm build script and the Go application during development to get live rebuilding of the UI code.

All necessary CSS and Javascript files are included for running the UI.

Transpiled bundle.js application is output to app/bundle.js, 'npm run build' script starts webpack to build the React application for development.
```
make app/bundle.js
make app/bundle
```

##### For development
The frontend is completly build by npm with laravel-mix. All plugins are buld into the compiled files. No plugins need to be load fro external sources.

It has different variants to build the frontend, provided by laravel-mix:
- `npm run dev` Build the code for development. This will also generate map-files, so the browser, can show, what line and file causes the output.
- `npm run watch` Build the code for development like the dev-command. This will not stop and automatically rebuild, when files are changed and saved.
- `npm run hot` Build the code for development. It has the same behaviour like the watch-command and also causes a hotReload of the files inside the browser (in theory)
- `npm run build` Build the code for deployment. It will generate no map-files and also minifies the bundle-files.
In every of those cases, also images and fonts will be copied to the app-folder.

### Building for Windows
1. Download the latest release source zip file
* [https://github.com/mroote/factorio-server-manager/releases](https://github.com/mroote/factorio-server-manager/releases)
Expand Down
20 changes: 0 additions & 20 deletions app/dist/LICENSE

This file was deleted.

235 changes: 0 additions & 235 deletions app/dist/README.md

This file was deleted.

Binary file removed app/dist/bootstrap/.DS_Store
Binary file not shown.
Loading