Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IPC GUI Update Nr.1 #733

Merged
merged 98 commits into from
Feb 4, 2018
Merged

IPC GUI Update Nr.1 #733

merged 98 commits into from
Feb 4, 2018

Conversation

MrBurrBurr
Copy link
Member

@MrBurrBurr MrBurrBurr commented Jan 27, 2018 •
edited

@MrBurrBurr MrBurrBurr changed the title Add info for not implemented features GUI Update and bug fixes Jan 27, 2018
@JustArchi
Copy link
Member

Let me know once your PR is ready 👍

@JustArchi JustArchi assigned JustArchi and MrBurrBurr and unassigned JustArchi Jan 27, 2018
@JustArchi JustArchi added the ✨ Enhancement Issues marked with this label indicate further enhancements to the program, such as new features. label Jan 27, 2018
@JustArchi
Copy link
Member

(And even better, use [WIP] in the title before it is, so my CI can automatically catch it)

@JustArchi JustArchi changed the title GUI Update and bug fixes [WIP] GUI Update and bug fixes Jan 27, 2018
@MrBurrBurr
Copy link
Member Author

MrBurrBurr commented Jan 27, 2018 •
edited

When the PR is done should I just remove the WIP?

@JustArchi
Copy link
Member

When the PR is done should I just remove the WIP?

Yes.

@JourneyOver JourneyOver mentioned this pull request Jan 27, 2018
Closed
12 tasks
@JustArchi
Copy link
Member

Not sure if this was fixed yet or not but IPC GUI should not ask for log.txt, currently it's 404 loop in the console.

(I'll take a look if NLog provides something we could use instead)

image

@JourneyOver
Copy link

Mm haven't seen that error yet O_o

@JustArchi
Copy link
Member

(And same for ASF.json and all files from the directory - IPC GUI is supposed to be served by ASF HTTP server, and user's javascript should not ask for files directly, ever)

JustArchi added a commit that referenced this pull request Jan 28, 2018
@JustArchi
Implement basic HTTP file server (IPC GUI binding), #733
37c8096 
I don't even want to know how many RFCs this thing violates. "It works!" 😅

Hopefully we'll improve it if needed.
@JustArchi
Copy link
Member

JustArchi commented Feb 2, 2018 •
edited

@felipe19930 Try to use it on Linux and you'll know why. Besides, since GC is tweakable, providing user with process memory could falsely make him think that ASF needs that much, which is false. I prefer to give user real data about how much ASF truly needs and makes use of, instead of telling him how big heap GC allocated for future use.

@JustArchi JustArchi added the 🚧 Work in progress Issues marked with this label are in active work-in-progress and they're not ready for review yet. label Feb 3, 2018
@JustArchi
Copy link
Member

JustArchi commented Feb 4, 2018 •
edited

I'm merging current state of this since I need to release new stable ASF ASAP. Since I'll be squashing the changes, you'll need to resume from clean branch.

git fetch https://github.com/JustArchi/ArchiSteamFarm master # Fetch current state of master branch from me, which will be entirely different than the one you're operating on right now once I squash the changes, due to rebasing.
git checkout FETCH_HEAD # Change current working directory to the one you fetched
git checkout -b ipcgui # Create new local branch called ipcgui, or whatever you want to name your branch, and switch to it
git push https://github.com/MrBurrBurr/ArchiSteamFarm ipcgui # Push your ipcgui branch, or whatever you decided to name on your GitHub repo.

Then you can switch to your branch on GitHub website and open new PR from there.

Thank you a lot for your ongoing work on this.

@JustArchi JustArchi removed the 🚧 Work in progress Issues marked with this label are in active work-in-progress and they're not ready for review yet. label Feb 4, 2018
@JustArchi JustArchi merged commit 7d9336a into JustArchiNET:master Feb 4, 2018
@MrBurrBurr MrBurrBurr changed the title [WIP] GUI Update and bug fixes IPC GUI Update Nr. Mar 9, 2018
@MrBurrBurr MrBurrBurr changed the title IPC GUI Update Nr. IPC GUI Update Nr. 1 Mar 9, 2018
@MrBurrBurr MrBurrBurr changed the title IPC GUI Update Nr. 1 IPC GUI Update Nr.1 Mar 9, 2018
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@JustArchi @fadillzzz
Implement basic HTTP file server (IPC GUI binding), JustArchiNET#733
757944f 
I don't even want to know how many RFCs this thing violates. "It works!" 😅

Hopefully we'll improve it if needed.
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@JustArchi @fadillzzz
IPC: require password only for /Api calls, JustArchiNET#733
4e35a3d
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@JustArchi @fadillzzz
Add WebSocket /Api/Log stub, JustArchiNET#733
149f1cd
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@JustArchi @fadillzzz
Huge /Api/Log update for JustArchiNET#733
d2b2c17
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@JustArchi @fadillzzz
Expose AvatarHash, JustArchiNET#733
5802406
fadillzzz pushed a commit to fadillzzz/ArchiSteamFarm that referenced this pull request Apr 11, 2018
@MrBurrBurr @fadillzzz
[WIP] GUI Update and bug fixes (JustArchiNET#733)
5f064a8 
* Add info for not implemented features

* Fixed bug within log function

* cleanup

* Fixed a display bug where the footer would add to the total height

* cleanup

* Use '/Api/Bot/' to read bot status

* Fixed update log function

* Adding some temp. logs to find a bug

* Fixed bot status bug and bot dropdown in command

* Final fix lol

* Fixed escaped quote

* Bug in status fixed

* Add RAM usage to dashboard

* Remove Ionicons

* hot fix for not supported API usage

* Add basic bot overview

* Replace local jQuery with public CDN

* Replace local bootstrap with public CDN

* Replace local font-awesome with public CDN

* Replace local bootstrap slider with public CDN

* info log for bot overview

* adapt to new IPC changes

* Complete basic bot overview and some cleanup

* Add authentication headers

* Append "?password=" query string for /Api/Log

* Remove "Status" page since it will be replaced by "Bots" page

* cleanup

* cleanup JustArchiNET#2

* - add info boxes to bot page
- add new background image for boxed view

* cleanup

* cleanup and random stuff

* Changed bot status color for "offline" from red to gray

* - added option to reset ipc password in sidebar
- reworked design of sidebar
- moved delete bot button to tools bar

* change NYI info

* Fix realtime logging buttons

* add logs for debugging

* Changed design of log box and command box

* Remove logs for debugging since the "bug" will be fixed

* Prepare dashboard for JustArchiNET#736

* add sweetalert for bootstrap (spicy replacement for modal and alert)

* "I-am-tired"-fix

* cleanup

* improve bot status function

* improve bot status function even more

* Update some icons

* fix

* add links to footer

* Add scrollbar to bots dropdown
Cleanup

* another cleanup

* remove dashboard and more informations to left sidebar

* Add placeholder for ramUsage

* Cleanup public CDN

* cleanup

* Replace bootstrap-slider.js with interact.js

* Implement "ProcessStartTime"

* Add auto refresh for asf infos and bot status

* Changed command buttons design on bot page
Misc cleanup
Changed layout to be fixed as default
Added function to fill command drop down on command page
Fixed autoScroll on log page

* cleanup

* Add save/load function for layout options

* use /img/boxed-bg.jpg

* Add save/load function for left sidebar

* Added semicolon where they were missing

* remove /img folder
use default background image for boxed layout

* Added steam avatar to bots page

* misc

* Add loading overlay to commands page
Change loading overlay color to white since background is black

* changed layout of bot box

* updated steamBaseURL for steam avatar

* Changed design of bots info boxes
Added expert mode setting in sidebar
Moved deleteBot button to tools box
Started adding content for config manager
Prepare bots overview for games farming implementation

* Added logic for farming info boxes and box body

* Fixed multiple games farming string

* Turn autoScroll buttons into one and add proper icon

* Optimized for smartphone

* Optimized for tablet

* cleanup

* Added leading zeroes to date

* prepare for splitting up commands if request url is too long

* Merge generator and manager into one page

* Change css of info overview in left sidebar

* cleanup

* Fixed right sidebar on iPad layout

* misc

* misc

* misc

* Added error handling for command
@lock lock bot locked as resolved and limited conversation to collaborators Jun 26, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@felipe19930 felipe19930 felipe19930 left review comments

Assignees

@MrBurrBurr MrBurrBurr

Labels
✨ Enhancement Issues marked with this label indicate further enhancements to the program, such as new features.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@MrBurrBurr @JustArchi @JourneyOver @felipe19930