Skip to content

Commit

Permalink
Merge pull request #32 from agiledev-students-spring2024/master
Browse files Browse the repository at this point in the history
update ella branch
  • Loading branch information
Ella-zizzzy authored Mar 27, 2024
2 parents 22c087d + e85bc23 commit 850c087
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 2 deletions.
8 changes: 8 additions & 0 deletions back-end/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// import and instantiate express
const express = require("express") // CommonJS import style!
const app = express() // instantiate an Express object

// we will put some server logic here later...

// export the express app we created to make it available to other modules
module.exports = app
5 changes: 5 additions & 0 deletions back-end/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"express": "^4.19.2"
}
}
19 changes: 19 additions & 0 deletions back-end/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env node

const server = require("./app") // load up the web server

const port = 3000 // the port to listen to for incoming requests

// call express's listen function to start listening to the port
const listener = server.listen(port, function () {
console.log(`Server running on port: ${port}`)
})

// a function to stop listening to the port
const close = () => {
listener.close()
}

module.exports = {
close: close,
}
6 changes: 6 additions & 0 deletions front-end/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import Closet from './screens/Closet';
import AddItem from './screens/AddItem';
import Generator from './screens/Generator';
import RandomOutfitGenerator from './screens/RandomOutfitGenerator';
import ItemDetail from './screens/ItemDetail';
import OutfitDetail from './screens/OutfitDetail';
import Archive from './screens/Archive';


function App() {
Expand All @@ -31,6 +34,9 @@ function App() {
<Route path="/pants" element={<Pants/>} />
<Route path="/shirt" element={<Shirt/>} />
<Route path="/shoes" element={<Shoes/>} />
<Route path="/ItemDetail" element={<ItemDetail/>} />
<Route path="/OutfitDetail" element={<OutfitDetail/>} />
<Route path="/Archive" element={<Archive/>} />
<Route path="/skirts-dresses" element={<SkirtsDresses/>} />
<Route path="/generator" element={<Generator/>} />
<Route path="/random" element={<RandomOutfitGenerator/>} />
Expand Down
1 change: 1 addition & 0 deletions front-end/src/screens/Archive.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import '../styles/Archive.css'

function Archive() {
return (
Expand Down
3 changes: 2 additions & 1 deletion front-end/src/screens/ItemDetail.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import '../styles/ItemDetail.css'

function ItemDetail() {
return (
Expand All @@ -14,7 +15,7 @@ function ItemDetail() {
<p>Notes</p>
</div>
</div>
)
);
}

export default ItemDetail;
Expand Down
3 changes: 2 additions & 1 deletion front-end/src/screens/OutfitDetail.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import '../styles/OutfitDetail.css'

function OutfitDetail() {
return (
Expand Down Expand Up @@ -38,5 +39,5 @@ function OutfitDetail() {
);
}

export default ItemDetail;
export default OutfitDetail;
<p> <strong style={{textDecoration: 'underline'}}> Item Detail</strong></p>
1 change: 1 addition & 0 deletions front-end/src/styles/Archive.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions front-end/src/styles/ItemDetail.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@import url('https://fonts.googleapis.com/css2?family=Cormorant+Infant:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=IM+Fell+French+Canon+SC&family=Inria+Serif:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:[email protected]&display=swap');

/* Consistent banner styling */
.ItemDetail-banner {
background: linear-gradient(to right, #f1e5ff, #fff0e7);
padding: 1.5rem;
text-align: center;
}

.ItemDetail-banner h1 {
font-family: "IM Fell French Canon SC", serif;
font-weight: 400;
margin: 0;
margin-left: 2em;
text-align: left;
font-size: 27px;

}

.ItemDetail-banner h3 {
font-family: 'Cormorant Infant', serif;
font-weight: 300;

}
25 changes: 25 additions & 0 deletions front-end/src/styles/OutfitDetail.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@import url('https://fonts.googleapis.com/css2?family=Cormorant+Infant:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=IM+Fell+French+Canon+SC&family=Inria+Serif:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:[email protected]&display=swap');


/* Consistent banner styling */
.OutfitDetail-banner {
background: linear-gradient(to right, #f1e5ff, #fff0e7);
padding: 1.5rem;
text-align: center;
}

.OutfitDetail-banner h1 {
font-family: "IM Fell French Canon SC", serif;
font-weight: 400;
margin: 0;
margin-left: 2em;
text-align: left;
font-size: 27px;

}

.OutfitDetail-banner h3 {
font-family: 'Cormorant Infant', serif;
font-weight: 300;

}

0 comments on commit 850c087

Please sign in to comment.