Skip to content
This repository has been archived by the owner on Mar 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #62 from dcsil/dev
Browse files Browse the repository at this point in the history 
Patch Invalid object path in Outfit Page
  • Loading branch information
@GareArc
GareArc authored Apr 16, 2023
2 parents 4d8313a + 32702fb commit bfe0a75
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 132 deletions.
Binary file modified .coverage
View file
Binary file not shown.
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
4. In the `./client` and `./server` folders, the above script has generated `.env` files. Make sure to modify the placeholder strings.
## Demo
[TODO: Demo Video (1.5-3mins)]
## Demo Write-Up
StylEase is a mobile app that helps users manage their wardrobe and create stylish outfits. Here are the main features of the app, as described in the demo video:
- **Home**: The Home page of the app displays the StylEase logo, and will eventually include a feature that shows users the current weather in their area. This can help users plan their outfits based on the weather conditions.
Expand Down
4 changes: 2 additions & 2 deletions client/views/CalendarRoute/AddEventPage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const AddEventPage = ({ route, navigation }) => {

const [name, setName] = React.useState("");
const [occasion, setOccasion] = React.useState("");
const [numColumns, setNumColumns] = React.useState(5);
const [numColumns, setNumColumns] = React.useState(3);

const [selectedItem, setSelectedItem] = useState(undefined);

Expand Down Expand Up @@ -123,7 +123,7 @@ export const AddEventPage = ({ route, navigation }) => {
<View style={{ marginHorizontal: 5 }}>
<FlatList
key={`OutfitRoute-${numColumns}`}
numColumns={numColumns}
numColumns={4}
directionalLockEnabled={true}
data={item.items}
renderItem={({ item }) => (
Expand Down
2 changes: 1 addition & 1 deletion client/views/OutfitRoute/OutfitAIConfigPage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const OutfitAIConfigPage = ({ navigation }) => {
// get the outfit data from the backend
const rmdOutfit = await outfitRecommend(user.userInfo._id, outfitTBS, false);

navigation.navigate('Outfit-new-from_ai_edit', { outfit: rmdOutfit.ai_outfit });
navigation.navigate('Outfit-new-from_ai_edit', { outfit: { ...rmdOutfit.ai_outfit, name: outfitTBS.name } });
}

return (
Expand Down
147 changes: 75 additions & 72 deletions coverage.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<coverage version="7.2.3" timestamp="1681591393821" lines-valid="715" lines-covered="619" line-rate="0.8657" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
<coverage version="7.2.3" timestamp="1681607073531" lines-valid="718" lines-covered="620" line-rate="0.8635" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.2.3 -->
<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
<sources>
Expand All @@ -21,7 +21,7 @@
</class>
</classes>
</package>
<package name="server.apis" line-rate="0.7975" branch-rate="0" complexity="0">
<package name="server.apis" line-rate="0.7945" branch-rate="0" complexity="0">
<classes>
<class name="__init__.py" filename="server/apis/__init__.py" complexity="0" line-rate="1" branch-rate="0">
<methods/>
Expand Down Expand Up @@ -125,7 +125,7 @@
<line number="154" hits="1"/>
</lines>
</class>
<class name="clothing_api.py" filename="server/apis/clothing_api.py" complexity="0" line-rate="0.8182" branch-rate="0">
<class name="clothing_api.py" filename="server/apis/clothing_api.py" complexity="0" line-rate="0.8113" branch-rate="0">
<methods/>
<lines>
<line number="1" hits="1"/>
Expand All @@ -151,141 +151,140 @@
<line number="36" hits="1"/>
<line number="37" hits="1"/>
<line number="38" hits="1"/>
<line number="40" hits="1"/>
<line number="41" hits="0"/>
<line number="44" hits="1"/>
<line number="46" hits="1"/>
<line number="41" hits="1"/>
<line number="42" hits="0"/>
<line number="45" hits="1"/>
<line number="47" hits="1"/>
<line number="48" hits="1"/>
<line number="49" hits="1"/>
<line number="50" hits="1"/>
<line number="51" hits="1"/>
<line number="52" hits="0"/>
<line number="53" hits="1"/>
<line number="52" hits="1"/>
<line number="53" hits="0"/>
<line number="54" hits="1"/>
<line number="55" hits="1"/>
<line number="56" hits="1"/>
<line number="57" hits="0"/>
<line number="57" hits="1"/>
<line number="58" hits="0"/>
<line number="63" hits="1"/>
<line number="69" hits="1"/>
<line number="59" hits="0"/>
<line number="64" hits="1"/>
<line number="70" hits="1"/>
<line number="71" hits="1"/>
<line number="72" hits="1"/>
<line number="73" hits="1"/>
<line number="74" hits="1"/>
<line number="76" hits="1"/>
<line number="75" hits="1"/>
<line number="77" hits="1"/>
<line number="78" hits="1"/>
<line number="79" hits="1"/>
<line number="80" hits="1"/>
<line number="85" hits="1"/>
<line number="87" hits="1"/>
<line number="81" hits="1"/>
<line number="86" hits="1"/>
<line number="88" hits="1"/>
<line number="89" hits="1"/>
<line number="90" hits="1"/>
<line number="91" hits="1"/>
<line number="92" hits="1"/>
<line number="99" hits="1"/>
<line number="93" hits="1"/>
<line number="100" hits="1"/>
<line number="104" hits="0"/>
<line number="101" hits="1"/>
<line number="105" hits="0"/>
<line number="111" hits="1"/>
<line number="106" hits="0"/>
<line number="112" hits="1"/>
<line number="113" hits="1"/>
<line number="114" hits="1"/>
<line number="115" hits="1"/>
<line number="117" hits="1"/>
<line number="119" hits="1"/>
<line number="116" hits="1"/>
<line number="118" hits="1"/>
<line number="120" hits="1"/>
<line number="121" hits="1"/>
<line number="122" hits="1"/>
<line number="123" hits="1"/>
<line number="124" hits="1"/>
<line number="126" hits="1"/>
<line number="125" hits="1"/>
<line number="127" hits="1"/>
<line number="128" hits="1"/>
<line number="129" hits="1"/>
<line number="130" hits="1"/>
<line number="131" hits="1"/>
<line number="132" hits="1"/>
<line number="133" hits="1"/>
<line number="137" hits="0"/>
<line number="134" hits="1"/>
<line number="138" hits="0"/>
<line number="145" hits="1"/>
<line number="139" hits="0"/>
<line number="146" hits="1"/>
<line number="147" hits="1"/>
<line number="148" hits="1"/>
<line number="149" hits="1"/>
<line number="151" hits="1"/>
<line number="153" hits="1"/>
<line number="155" hits="1"/>
<line number="150" hits="1"/>
<line number="152" hits="1"/>
<line number="154" hits="1"/>
<line number="156" hits="1"/>
<line number="157" hits="1"/>
<line number="158" hits="1"/>
<line number="160" hits="1"/>
<line number="162" hits="0"/>
<line number="159" hits="1"/>
<line number="161" hits="1"/>
<line number="163" hits="0"/>
<line number="167" hits="1"/>
<line number="172" hits="1"/>
<line number="164" hits="0"/>
<line number="168" hits="1"/>
<line number="173" hits="1"/>
<line number="174" hits="1"/>
<line number="175" hits="1"/>
<line number="176" hits="1"/>
<line number="177" hits="1"/>
<line number="179" hits="1"/>
<line number="181" hits="1"/>
<line number="178" hits="1"/>
<line number="180" hits="1"/>
<line number="182" hits="1"/>
<line number="183" hits="0"/>
<line number="184" hits="1"/>
<line number="183" hits="1"/>
<line number="184" hits="0"/>
<line number="185" hits="1"/>
<line number="186" hits="1"/>
<line number="187" hits="1"/>
<line number="188" hits="0"/>
<line number="188" hits="1"/>
<line number="189" hits="0"/>
<line number="193" hits="1"/>
<line number="198" hits="1"/>
<line number="190" hits="0"/>
<line number="194" hits="1"/>
<line number="199" hits="1"/>
<line number="200" hits="1"/>
<line number="201" hits="1"/>
<line number="202" hits="1"/>
<line number="203" hits="1"/>
<line number="205" hits="1"/>
<line number="207" hits="1"/>
<line number="204" hits="1"/>
<line number="206" hits="1"/>
<line number="208" hits="1"/>
<line number="209" hits="1"/>
<line number="210" hits="1"/>
<line number="211" hits="0"/>
<line number="211" hits="1"/>
<line number="212" hits="0"/>
<line number="216" hits="1"/>
<line number="221" hits="1"/>
<line number="213" hits="0"/>
<line number="217" hits="1"/>
<line number="222" hits="1"/>
<line number="223" hits="0"/>
<line number="223" hits="1"/>
<line number="224" hits="0"/>
<line number="225" hits="0"/>
<line number="227" hits="0"/>
<line number="226" hits="0"/>
<line number="228" hits="0"/>
<line number="231" hits="0"/>
<line number="233" hits="0"/>
<line number="229" hits="0"/>
<line number="232" hits="0"/>
<line number="234" hits="0"/>
<line number="237" hits="0"/>
<line number="242" hits="1"/>
<line number="235" hits="0"/>
<line number="238" hits="0"/>
<line number="243" hits="1"/>
<line number="244" hits="1"/>
<line number="245" hits="1"/>
<line number="246" hits="0"/>
<line number="247" hits="1"/>
<line number="246" hits="1"/>
<line number="247" hits="0"/>
<line number="248" hits="1"/>
<line number="249" hits="1"/>
<line number="250" hits="1"/>
<line number="251" hits="0"/>
<line number="252" hits="1"/>
<line number="254" hits="1"/>
<line number="251" hits="1"/>
<line number="252" hits="0"/>
<line number="253" hits="1"/>
<line number="255" hits="1"/>
<line number="256" hits="1"/>
<line number="258" hits="1"/>
<line number="263" hits="0"/>
<line number="268" hits="1"/>
<line number="257" hits="1"/>
<line number="259" hits="1"/>
<line number="264" hits="0"/>
<line number="269" hits="1"/>
<line number="270" hits="1"/>
<line number="271" hits="1"/>
Expand All @@ -296,13 +295,13 @@
<line number="276" hits="1"/>
<line number="277" hits="1"/>
<line number="278" hits="1"/>
<line number="279" hits="0"/>
<line number="280" hits="1"/>
<line number="279" hits="1"/>
<line number="280" hits="0"/>
<line number="281" hits="1"/>
<line number="282" hits="1"/>
<line number="283" hits="1"/>
<line number="284" hits="0"/>
<line number="285" hits="1"/>
<line number="284" hits="1"/>
<line number="285" hits="0"/>
<line number="286" hits="1"/>
<line number="287" hits="1"/>
<line number="288" hits="1"/>
Expand All @@ -312,31 +311,35 @@
<line number="292" hits="1"/>
<line number="293" hits="1"/>
<line number="294" hits="1"/>
<line number="301" hits="1"/>
<line number="295" hits="1"/>
<line number="302" hits="1"/>
<line number="303" hits="1"/>
<line number="304" hits="1"/>
<line number="305" hits="1"/>
<line number="306" hits="1"/>
<line number="307" hits="1"/>
<line number="308" hits="1"/>
<line number="309" hits="0"/>
<line number="310" hits="1"/>
<line number="309" hits="1"/>
<line number="310" hits="0"/>
<line number="311" hits="1"/>
<line number="312" hits="1"/>
<line number="313" hits="1"/>
<line number="314" hits="1"/>
<line number="319" hits="0"/>
<line number="323" hits="0"/>
<line number="328" hits="1"/>
<line number="315" hits="1"/>
<line number="320" hits="0"/>
<line number="324" hits="0"/>
<line number="329" hits="1"/>
<line number="330" hits="1"/>
<line number="367" hits="1"/>
<line number="368" hits="1"/>
<line number="369" hits="1"/>
<line number="370" hits="1"/>
<line number="372" hits="1"/>
<line number="373" hits="1"/>
<line number="331" hits="1"/>
<line number="332" hits="1"/>
<line number="333" hits="1"/>
<line number="334" hits="1"/>
<line number="335" hits="1"/>
<line number="336" hits="1"/>
<line number="337" hits="1"/>
<line number="338" hits="1"/>
<line number="343" hits="0"/>
<line number="344" hits="0"/>
</lines>
</class>
<class name="detection.py" filename="server/apis/detection.py" complexity="0" line-rate="0.4" branch-rate="0">
Expand Down
Loading

0 comments on commit bfe0a75

Please sign in to comment.