diff --git a/README.md b/README.md index 7cc80600503..66e089e4d6a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,11 @@
Click on the gif below for a DEMO of the terminal.
- [](https://www.youtube.com/watch?v=fqGPK8OVHLk) +
+
+
+
+
Investment research for everyone. @@ -53,7 +57,7 @@ Suggest Improvement ยท - Request Feature + Request a Feature
@@ -86,11 +90,21 @@ As a modern Python-based environment, GamestonkTerminal opens access to numerous (Pandas, Numpy, Scipy, Jupyter), Machine Learning (Pytorch, Tensorflow, Sklearn, Flair), and Data Acquisition (Beautiful Soup, and numerous third-party APIs). +## Installation + +If you wish to install the Terminal, there are currently four options: + +- [Using the Installer](gamestonk_terminal/README.md#User) (recommended if you just want to use the terminal) +- [Using Python](gamestonk_terminal/README.md#anaconda--python) (recommended if you want to develop new features) +- [Using Docker](gamestonk_terminal/README.md#Docker-Installation) (alternative option to the installer if preferred) +- [Using Docker Web UI](gamestonk_terminal/README.md#web-ui---docker) (if you want to deploy the web UI for users to access over your LAN) + ## Contributing There are 3 main ways of contributing to this project. -For a 1h coding session where the architecture of the repo is explained while a new feature is added, check
-If you want to install the terminal using Python ignore the Docker section and jump to Local Install - Anaconda and Python section.
+If you want to install the terminal using Python ignore the User section and jump to Anaconda & Python section.
-### Docker Installation
+## User
-1. Make sure docker desktop is installed. Install links can be found [here](https://www.docker.com/products/docker-desktop).
- To confirm that your docker desktop is downloaded and running, open a command prompt or terminal and enter
- `docker info`. If you get the following you are not running the docker desktop:
+If you are interested in running the terminal via the installer, these steps will guide you through the installation
+process and explain to you what each message means.
- ```text
- Server:
- ERROR: Cannot connect to the Docker daemon at unix:///var/run/docker.sock.
- Is the docker daemon running?
- ```
+### Installing Process
- Open the docker desktop app in this case.
+The process starts off by downloading the installer, see below the most recent release:
-2. Download the latest docker image.
+- Windows: [LINK TO INSTALLER FILE](https://github.com/GamestonkTerminal/GamestonkTerminal/)
+- macOS: [LINK TO INSTALLER FILE](https://github.com/GamestonkTerminal/GamestonkTerminal/)
- ```bash
- docker pull ghcr.io/gamestonkterminal/gst-poetry:latest
- ```
+This downloads the installer to your computer and by clicking on the created file, you are able to start
+the installation process.
- Upon running this the first time, you should see the various layers downloading (note the random series of letters numbers will vary). The first time this is run, it will take a few minutes. Subsequent updates will be much faster, as the changes will be in the MB instead of GB.
+**_STILL NEED TO ADD WALKTHROUGH AND IMAGES_**
- 
+| Note about "Malicious Software" warning |
+|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| You will most likely see one of the following images displayed below. This is because the installer is still in beta phase, and the team has not requested verification from neither Windows nor Apple. |
- Once the download is complete, confirm that the image has been created by doing `docker images`. You should see
- something similar to
+**_STILL NEED TO ADD IMAGES_**
- ```text
- REPOSITORY TAG IMAGE ID CREATED SIZE
- ghcr.io/gamestonkterminal/gst-poetry latest e2bbeebcc73c 42 hours ago 2.02GB
- ```
+To mark the application as safe for usage, use the following steps:
-3. Run a container
+#### On Windows
- You are now ready to run the terminal (every time you want to use the terminal you need to run this command):
+**_STILL NEED TO ADD CONTENT_**
- `docker run -it --rm ghcr.io/gamestonkterminal/gst-poetry:latest`
+#### On macOS
- This will open up the terminal in your command prompt or terminal. Note that this has provided now environment file,
- so you will not be able to view plots or use keys at this stage.
+1) Run the file. You will most likely receive a message that macOS was not able to check whether the application
+contains malicious software. The reasoning for this is described in the note above.
+2) Go to macOS System Preferences > Security & Privacy > General. You should see see a message at the bottom that says
+that the file "_was blocked from use because it is not from an identified developer_".
+3) Click on the button "Allow anyway"
+4) You should now be able to use the application.
- At this point, you should be able to use the majority of the features using Docker. To read more on adding the environment keys and how to configure your X-server to show plots, hop over to the
- [Advanced Docker Setup](/DOCKER_ADVANCED.md).
+_WHAT ELSE?_
-### Local Install - Anaconda and Python
+## Developer
+
+### Anaconda & Python
This installation type supports both Windows and Unix systems (Linux + MacOS). However, on Windows it can become messy so it is easier to use Windows Subsystem Linux (WSL) on this operating system. WSL emulates a Linux machine inside your Windows system.
If you are using macOS or other Linux operating systems you can jump the next section Installing the terminal.
-### Web UI - Docker
-
-1. Ensure Docker is installed.
-2. Navigate to the location of the Dockerfile in the repo (`cd gamestonk_terminal_web`)
-3. Ensure the launcher is executable with `chmod +x ./launch`
-4. Launch it with `./launch`. If you get a permission denied error, do `sudo ./launch` instead
-5. Once it's launched, you will be able to access it by going to `http://host-ip:8080` in a browser, or `http://localhost:8080` if you are running it on your local machine.
-
-For API keys, create the `setenv` file if it doesn't already exist.
-It will automatically get created on the first launch, and won't get committed to Git because it is on the `.gitignore`.
-Set the API keys [as explained here](https://github.com/GamestonkTerminal/GamestonkTerminal/blob/main/DOCKER_ADVANCED.md#environment-variables).
-Once you've put the API keys in that file, re-run the launch script, and it will use your API keys.
-There are a few things that still don't work, and you can see what works and what doesn't [here](https://github.com/CoconutMacaroon/GamestonkTerminal/blob/main/gamestonk_terminal_web/README.md#todo).
-
#### Installing WSL (Only for Windows users)
If you are using Windows you first you need to install WSL. The process is simple and a tutorial can be found [here](https://www.sitepoint.com/wsl2/). Once you reach the section **Update Linux** on that tutorial, you should have a linux machine installed and can proceed to the next steps.
@@ -261,9 +243,82 @@ If you `stashed` your changes previously, you can un-stash them with:
git stash pop
```
+### Docker Installation
+
+1. Make sure docker desktop is installed. Install links can be found [here](https://www.docker.com/products/docker-desktop).
+ To confirm that your docker desktop is downloaded and running, open a command prompt or terminal and enter
+ `docker info`. If you get the following you are not running the docker desktop:
+
+ ```text
+ Server:
+ ERROR: Cannot connect to the Docker daemon at unix:///var/run/docker.sock.
+ Is the docker daemon running?
+ ```
+
+ Open the docker desktop app in this case.
+
+2. Download the latest docker image.
+
+ ```bash
+ docker pull ghcr.io/gamestonkterminal/gst-poetry:latest
+ ```
+
+ Upon running this the first time, you should see the various layers downloading (note the random series of letters numbers will vary). The first time this is run, it will take a few minutes. Subsequent updates will be much faster, as the changes will be in the MB instead of GB.
+
+ 
+
+ Once the download is complete, confirm that the image has been created by doing `docker images`. You should see
+ something similar to
+
+ ```text
+ REPOSITORY TAG IMAGE ID CREATED SIZE
+ ghcr.io/gamestonkterminal/gst-poetry latest e2bbeebcc73c 42 hours ago 2.02GB
+ ```
+
+3. Run a container
+
+ You are now ready to run the terminal (every time you want to use the terminal you need to run this command):
+
+ `docker run -it --rm ghcr.io/gamestonkterminal/gst-poetry:latest`
+
+ This will open up the terminal in your command prompt or terminal. Note that this has provided now environment file,
+ so you will not be able to view plots or use keys at this stage.
+
+ At this point, you should be able to use the majority of the features using Docker. To read more on adding the environment keys and how to configure your X-server to show plots, hop over to the
+ [Advanced Docker Setup](/DOCKER_ADVANCED.md).
+
+### Web UI - Docker
+
+1. Ensure Docker is installed.
+2. Navigate to the location of the Dockerfile in the repo (`cd gamestonk_terminal_web`)
+3. Ensure the launcher is executable with `chmod +x ./launch`
+4. Launch it with `./launch`. If you get a permission denied error, do `sudo ./launch` instead
+5. Once it's launched, you will be able to access it by going to `http://host-ip:8080` in a browser, or `http://localhost:8080` if you are running it on your local machine.
+
+For API keys, create the `setenv` file if it doesn't already exist.
+It will automatically get created on the first launch, and won't get committed to Git because it is on the `.gitignore`.
+Set the API keys [as explained here](https://github.com/GamestonkTerminal/GamestonkTerminal/blob/main/DOCKER_ADVANCED.md#environment-variables).
+Once you've put the API keys in that file, re-run the launch script, and it will use your API keys.
+There are a few things that still don't work, and you can see what works and what doesn't [here](https://github.com/CoconutMacaroon/GamestonkTerminal/blob/main/gamestonk_terminal_web/README.md#todo).
+
### API Keys
-The project is build around several different API calls, whether it is to access historical data or financials. The table below shows the ones where a key is necessary. The environment variable names are shown explicitly, for the variable name in the code one just needs to remove the "GT\_", this can be found in [config_terminal.py](/gamestonk_terminal/config_terminal.py).
+The project is build around several different API calls, whether it is to access historical data or financials.
+The table below shows the ones where a key is necessary.
+
+The easiest way is of updating the keys is by using the terminal. You are able to directly set these variables from
+within the "keys" menu. This menu can be found on the first menu you see when opening the terminal.
+
+
+
+Then, by typing the command on the left-hand side, followed by your API Key, you can set the key and use the commands
+attached to it.
+
+
+
+When you have installed the terminal through Anaconda & Python, you can use the environment variable to set your
+API Keys directly instead of using the Terminal, for the variable name in the code one just needs to
+remove the "GT\_", this can be found in [config_terminal.py](/gamestonk_terminal/config_terminal.py).
| Website | Environment Variables |
| :------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------ |
diff --git a/images/api_keys_part_1.png b/images/api_keys_part_1.png
new file mode 100644
index 00000000000..a9c4620dfa5
Binary files /dev/null and b/images/api_keys_part_1.png differ
diff --git a/images/api_keys_part_2.png b/images/api_keys_part_2.png
new file mode 100644
index 00000000000..45d9404a8da
Binary files /dev/null and b/images/api_keys_part_2.png differ
diff --git a/images/usage.gif b/images/usage.gif
index 2389178595a..d324da0218d 100644
Binary files a/images/usage.gif and b/images/usage.gif differ