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.

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

update #374

Merged
merged 1 commit into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ai/ai.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def initialize_recommenders(self, rec_class):
recArgs = self.DEFAULT_REC_ARGS[pred_type]
recArgs['ml_p'] = ml_p

recArgs['serialized_rec_directory'] = 'data/recommenders/pennaiweb'
recArgs['serialized_rec_directory'] = '/appsrc/data/recommenders/pennaiweb'
recArgs['load_serialized_rec'] = "if_exists"

if kb is not None:
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-raspberrypi-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ services:
- ./config/ai.env
depends_on:
- dbmongo
restart: always

machine:
build:
Expand All @@ -41,7 +40,6 @@ services:
depends_on:
- lab
- dbmongo
restart: always

dbmongo:
build:
Expand All @@ -53,4 +51,3 @@ services:
ports:
- "27017:27017"
env_file: ./config/common.env
restart: always
6 changes: 6 additions & 0 deletions docker/dbmongo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ WORKDIR /opt/

ARG docker_filepath=docker/dbmongo/files

# RUN apt-get update
# RUN apt-get install gpg wget
# RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
# RUN apt-get update


#add repo for mongodb
RUN echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list
RUN apt-get update --fix-missing && \
Expand Down
3 changes: 1 addition & 2 deletions docs/guides/userGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ Aliro is a multi-container docker project that uses ([Docker-Compose](https://do
- [Linux Docker-Compose Installation](https://docs.docker.com/compose/install/)

### Installation
1. Download the production zip `Aliro-*.zip` from the asset section of the [latest release](https://github.com/EpistasisLab/Aliro/releases/latest)
- Note that this is different from the source code zip file.
1. Download the production zip `Aliro-*.zip` from the asset section of the [latest release](https://github.com/EpistasisLab/Aliro/releases/latest) (note that this is different from the source code zip file).
2. Unzip the archive

## Using Aliro
Expand Down
119 changes: 119 additions & 0 deletions lab/webapp/dist/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,125 @@ pre.schema {
}
}

div#segmentAddNewdataCard {
/* background: #2185d0;
border-color: #2185d0; */

background: #419ce1;
border-color: #419ce1;
}

/* element a in div#segmentAddNewdataCard */
div#gridAddNewdataCard a {
/* make upper edges round */
/* border-radius: .28571429rem .28571429rem .28571429rem .28571429rem !important; */

/* make the cross icond located in the center of div#gridAddNewdataCard */
/* margin-left: 0.5em; */

/* margin 0 */
margin: 0 !important;


}

a#addNewDatasetBtnCross i {

position: absolute;
top: 45%;
right: 40%;
font-size: xxx-large;
}


/* Below ids are the elements in the "Add new dataset button" */
#testcell, #testcell2 ,#testcell3 {
background-color: #2185d0;
border-color: #2185d0;
color: #2185d0 !important;
}

#testseg{
background-color: #2185d0;
border-color: #2185d0;
color: #2185d0 !important;
}
#testheader{
background-color: #2185d0;
border-color: #2185d0;
color: #2185d0 !important;
}



@-webkit-keyframes blinker {
0% { opacity: 8.0; }
50% { opacity: 0.3; }
100% { opacity: 0.8; }

/* change backgourd color */
/* 0% { background-color: #2185d0; }
50% { background-color: #df0909; }
100% { background-color: #2185d0; } */

/* change boarder color */
/* 0% { border-color: #2185d0; }
50% { border-color: #df0909; }
100% { border-color: #2185d0; } */

/* change backgourd color */
/* 0% { background-color: #2185d0; }
50% { background-color: #df0909; }
100% { background-color: #2185d0; } */

/* change boader color */
/* 0% { border-color: #2185d0; }
50% { border-color: #df0909; }
100% { border-color: #2185d0; } */

/* change text color */
/* 0% { color: #2185d0; }
50% { color: #df0909; }
100% { color: #2185d0; } */

/* change text thickness */
/* 0% { font-weight: 100; }
50% { font-weight: 900; }
100% { font-weight: 100; } */

/* change boader color */

/* 0% { border-color: #2185d0; }
50% { border-color: #df0909; }
100% { border-color: #2185d0; } */





}

#addNewPopup .content, #algorithm-popup .content {

/* width: 10px; */
/* height: 10px; */
border-radius: 10px;
/* */
/* animation: blinker 2s linear infinite; */
/* background-color: red; */
/* border-color: green; */
/* margin-right: 5px; */
}

#addNewPopup, #algorithm-popup {
display: flex;
flex-direction: row;
align-items: center;
animation: blinker 3s linear infinite;
}



/*@media (min-width: 140rem) {
body {
line-height: calc(1.5 * 2.5);
Expand Down
28 changes: 25 additions & 3 deletions lab/webapp/src/components/App/Navbar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import MediaQuery from 'react-responsive';
import DeviceWatcher from '../../../utils/device-watcher';
import { Menu, Dropdown, Icon } from 'semantic-ui-react';
import { Link } from 'react-router';


/**
* child component of menu bar - if preferences successfully retrieved, create
* menu bar with links to other sections of site
Expand All @@ -52,7 +54,7 @@ function Navbar({ preferences }) {
<Menu.Item header name="Aliro" />
</Link>
<MediaQuery minWidth={DeviceWatcher.breakpoints.MAX_MOBILE}>
<Menu.Item name="Your friendly AI assistant" />
<Menu.Item name="Hello Your friendly AI assistant" />
</MediaQuery>
{preferences &&
<Menu.Menu position="right">
Expand Down Expand Up @@ -80,12 +82,32 @@ function Navbar({ preferences }) {
</MediaQuery>
</Menu.Item>
</Link>
<Menu.Item>
{/* if machine is not window then do not show below item */}

{/* <Menu.Item id='user_item'>
<Icon name="user" />
<MediaQuery minWidth={DeviceWatcher.breakpoints.MIN_TABLET}>
{preferences.username}
</MediaQuery>
</Menu.Item>
</Menu.Item> */}

{/* {window.navigator.oscpu==='Intel Mac OS X 10.15'? */}
{window.navigator.oscpu==='Intel Mac OS X 10.15.'?

<Menu.Item id='user_item'>
<Icon name="user" />
<MediaQuery minWidth={DeviceWatcher.breakpoints.MIN_TABLET}>
{preferences.username}
</MediaQuery>
</Menu.Item> :

// empty div
<div></div>

}



</Menu.Menu>
}
</Menu>
Expand Down
Loading